X-Git-Url: http://git.kpe.io/?p=clsql.git;a=blobdiff_plain;f=clsql-tests.asd;h=f0280fc92510a84a1490f1c7fe38b7e3552da079;hp=afceb8c726a18ea03fafbdacd531ba19a458a83a;hb=f2e97f7b39c1cf82b6f3d1cec9362e551761549e;hpb=c4ffac239e4910bff542dadf3212ad95803af64e

diff --git a/clsql-tests.asd b/clsql-tests.asd
index afceb8c..f0280fc 100644
--- a/clsql-tests.asd
+++ b/clsql-tests.asd
@@ -2,22 +2,26 @@
 ;;;; *************************************************************************
 ;;;; FILE IDENTIFICATION
 ;;;;
-;;;; File:    clsql-tests.asd
-;;;; Author:  Marcus Pearce <m.t.pearce@city.ac.uk>
-;;;; Created: 30/03/2004
-;;;; Updated: <04/04/2004 12:34:41 marcusp>
+;;;; File:     clsql-tests.asd
+;;;; Authors:  Marcus Pearce and Kevin Rosenberg
+;;;; Created:  30/03/2004
 ;;;;
-;;;; $Id: clsql-classic.asd 8847 2004-04-07 14:38:14Z kevin $
+;;;; This file is part of CLSQL.
 ;;;;
 ;;;; CLSQL users are granted the rights to distribute and use this software
 ;;;; as governed by the terms of the Lisp Lesser GNU Public License
 ;;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL.
 ;;;; *************************************************************************
-;;;; ======================================================================
 
 (in-package #:cl-user)
+(defpackage #:clsql-tests-system (:use #:asdf #:cl))
+(in-package #:clsql-tests-system)
 
-(asdf:defsystem clsql-tests
+(eval-when (:compile-toplevel :load-toplevel :execute)
+  (unless (find-package '#:uffi)
+    (asdf:operate 'asdf:load-op 'uffi)))
+
+(defsystem clsql-tests
     :name "CLSQL Tests"
     :author ""
     :maintainer ""
@@ -25,14 +29,32 @@
     :licence ""
     :description "A regression test suite for CLSQL."
     :depends-on (clsql rt)
-    :components 
+    :components
     ((:module tests
 	      :serial t
 	      :components ((:file "package")
+			   (:file "utils")
 			   (:file "test-init")
+			   (:file "datasets")
+			   (:file "ds-employees")
+			   (:file "ds-nodes")
+			   (:file "ds-artists")
+			   (:file "benchmarks")
+			   (:file "test-internal")
+			   (:file "test-basic")
+			   (:file "test-time")
 			   (:file "test-connection")
 			   (:file "test-fddl")
 			   (:file "test-fdml")
 			   (:file "test-ooddl")
 			   (:file "test-oodml")
-			   (:file "test-syntax")))))
+			   (:file "test-syntax")
+                           (:file "test-pool")
+                           ; #-uffi:no-i18n (:file "test-i18n")
+                           ))))
+
+(defmethod perform ((o test-op) (c (eql (find-system 'clsql-tests))))
+  (operate 'load-op 'clsql)
+  (unless (funcall (intern (symbol-name '#:run-tests)
+			   (find-package '#:clsql-tests)))
+    (error "test-op failed")))