X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=clsql-tests.asd;h=6da0173eba355a45601f6ad90f6be1ec0201a55a;hb=43ec897ec7d84892fa59cc9b7858ce23d64a8a1a;hp=19883027c8bdbb6c36eafe85ea3ab0714228068b;hpb=8d558ce162d1360f92e4d65d054e2f61c786319e;p=clsql.git

diff --git a/clsql-tests.asd b/clsql-tests.asd
index 1988302..6da0173 100644
--- a/clsql-tests.asd
+++ b/clsql-tests.asd
@@ -7,11 +7,11 @@
 ;;;; Author:        Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2003
 ;;;;
-;;;; $Id: clsql-tests.asd,v 1.1 2003/05/02 03:05:54 kevin Exp $
+;;;; $Id$
 ;;;; *************************************************************************
 
-(defpackage #:clsql-tests-system
-  (:use #:asdf #:cl))
+(in-package #:cl-user)
+(defpackage #:clsql-tests-system (:use #:asdf #:cl))
 (in-package #:clsql-tests-system)
 
 (defsystem clsql-tests
@@ -21,20 +21,22 @@
   :licence "Lessor Lisp General Public License"
   :description "Testing suite for CLSQL"
 
-  :depends-on (:clsql :clsql-mysql :clsql-postgresql :clsql-postgresql-socket
-		      #+allegro :clsql-aodbc)
+  :depends-on (:clsql #-clisp :clsql-mysql 
+		      #-clisp :clsql-postgresql
+		      #-clisp :clsql-postgresql-socket
+		      :ptester
+		      #+(and allegro (not allegro-cl-trial)) :clsql-aodbc
+		      :clsql-sqlite)
   :components
   ((:module tests
 	    :components
-	    ((:file "rt")
-	     (:file "acl-compat-tester")
-	     (:file "package" :depends-on ("rt"))
+	    ((:file "package")
 ;;	     (:file "tables" :depends-on ("package")))
-	     (:file "tests" :depends-on ("package" "acl-compat-tester")))
+	     (:file "tests" :depends-on ("package")))
 	    )))
 
-(defmethod perform ((o test-op) (c (eql (find-system :clsql-tests))))
-  (or (funcall (intern (symbol-name '#:do-tests)
-		       (find-package '#:regression-test)))
-      (error "test-op failed")))
+(defmethod perform ((o test-op) (c (eql (find-system 'clsql-tests))))
+  (unless (funcall (intern (symbol-name '#:run-tests)
+			   (find-package '#:clsql-tests)))
+    (error "test-op failed")))