X-Git-Url: http://git.kpe.io/?p=clsql.git;a=blobdiff_plain;f=clsql-tests.asd;h=9d4df2f67e4c223ce5c13b7b7fedfdf77915a0b6;hp=de6808828f9c6487414ac836971b9d49ab68c09f;hb=d9f41af62750c622945bb17b622a39689ee5b840;hpb=2dfae2a07c7ee0826a17edde3c23ef493b18bdb5

diff --git a/clsql-tests.asd b/clsql-tests.asd
index de68088..9d4df2f 100644
--- a/clsql-tests.asd
+++ b/clsql-tests.asd
@@ -1,13 +1,17 @@
-;;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Base: 10 -*-
+;;;; -*- Mode: LISP; Syntax: ANSI-Common-Lisp; Base: 10 -*-
 ;;;; *************************************************************************
 ;;;; FILE IDENTIFICATION
 ;;;;
-;;;; Name:          clsql-tests.asd
-;;;; Purpose:       ASDF system definitionf for clsql testing package
-;;;; Author:        Kevin M. Rosenberg
-;;;; Date Started:  Apr 2003
+;;;; File:     clsql-tests.asd
+;;;; Authors:  Marcus Pearce <m.t.pearce@city.ac.uk> and Kevin Rosenberg 
+;;;; Created:  30/03/2004
+;;;; Updated:  $Id$
 ;;;;
-;;;; $Id: clsql-tests.asd,v 1.4 2003/07/20 18:31:22 kevin Exp $
+;;;; 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)
@@ -15,26 +19,32 @@
 (in-package #:clsql-tests-system)
 
 (defsystem clsql-tests
-  :name "clsql-tests"
-  :author "Kevin Rosenberg <kevin@rosenberg.net>"
-  :maintainer "Kevin M. Rosenberg <kmr@debian.org>"
-  :licence "Lessor Lisp General Public License"
-  :description "Testing suite for CLSQL"
-
-  :depends-on (:clsql :clsql-mysql :clsql-postgresql :clsql-postgresql-socket
-		      #+allegro :clsql-aodbc)
-  :components
-  ((:module tests
-	    :components
-	    ((:file "rt")
-	     (:file "ptester")
-	     (:file "package" :depends-on ("rt"))
-;;	     (:file "tables" :depends-on ("package")))
-	     (:file "tests" :depends-on ("package" "ptester")))
-	    )))
+    :name "CLSQL Tests"
+    :author ""
+    :maintainer ""
+    :version ""
+    :licence ""
+    :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")))))
 
 (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")))
-
+  (operate 'load-op 'clsql)
+  (unless (funcall (intern (symbol-name '#:run-tests)
+			   (find-package '#:clsql-tests)))
+    (error "test-op failed")))