X-Git-Url: http://git.kpe.io/?p=clsql.git;a=blobdiff_plain;f=clsql-tests.asd;h=9d4df2f67e4c223ce5c13b7b7fedfdf77915a0b6;hp=a9486ac3eeebacb6646de9e327ae262e96f4770a;hb=11261eca2090842638d1b3b7c12b7cc1f6d58f09;hpb=7f0e4a65d1b425f2fa58fc7cce8296c1a6c52c2f

diff --git a/clsql-tests.asd b/clsql-tests.asd
index a9486ac..9d4df2f 100644
--- a/clsql-tests.asd
+++ b/clsql-tests.asd
@@ -2,37 +2,49 @@
 ;;;; *************************************************************************
 ;;;; 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 <m.t.pearce@city.ac.uk> and Kevin Rosenberg 
+;;;; Created:  30/03/2004
+;;;; Updated:  $Id$
 ;;;;
-;;;; $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
+(defsystem clsql-tests
     :name "CLSQL Tests"
     :author ""
     :maintainer ""
     :version ""
     :licence ""
-    :description "A regression test suite for CLSQL-USQL."
+    :description "A regression test suite for CLSQL."
+    :depends-on (clsql rt)
     :components 
     ((:module tests
 	      :serial t
 	      :components ((:file "package")
+			   (:file "utils")
 			   (:file "test-init")
+			   (: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"))))
-    :depends-on (:clsql :rt))
+			   (:file "test-syntax")))))
+
+(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")))