X-Git-Url: http://git.kpe.io/?p=clsql.git;a=blobdiff_plain;f=clsql-tests.asd;h=f0280fc92510a84a1490f1c7fe38b7e3552da079;hp=7a7d6d9b6da392e320c9f469a68ebba098e334cb;hb=da9282a5c0ce927c613f1706f1c51796c75e16e4;hpb=5691bb90517d7c565a141d131da76c3de1f8d566

diff --git a/clsql-tests.asd b/clsql-tests.asd
index 7a7d6d9..f0280fc 100644
--- a/clsql-tests.asd
+++ b/clsql-tests.asd
@@ -3,21 +3,23 @@
 ;;;; FILE IDENTIFICATION
 ;;;;
 ;;;; File:     clsql-tests.asd
-;;;; Authors:  Marcus Pearce <m.t.pearce@city.ac.uk> and Kevin Rosenberg 
+;;;; Authors:  Marcus Pearce and Kevin Rosenberg
 ;;;; Created:  30/03/2004
-;;;; Updated:  $Id$
 ;;;;
-;;;; $Id$
+;;;; 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-classic-tests-system (:use #:asdf #:cl))
-(in-package #:clsql-classic-tests-system)
+(defpackage #:clsql-tests-system (:use #:asdf #:cl))
+(in-package #:clsql-tests-system)
+
+(eval-when (:compile-toplevel :load-toplevel :execute)
+  (unless (find-package '#:uffi)
+    (asdf:operate 'asdf:load-op 'uffi)))
 
 (defsystem clsql-tests
     :name "CLSQL Tests"
@@ -27,21 +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))))
-  (error "Automated performing of test-op is not yet supported.")
-  #+ignore
+  (operate 'load-op 'clsql)
   (unless (funcall (intern (symbol-name '#:run-tests)
 			   (find-package '#:clsql-tests)))
     (error "test-op failed")))