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

diff --git a/clsql-tests.asd b/clsql-tests.asd
index 1988302..f0280fc 100644
--- a/clsql-tests.asd
+++ b/clsql-tests.asd
@@ -1,40 +1,60 @@
-;;;; -*- 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 and Kevin Rosenberg
+;;;; Created:  30/03/2004
 ;;;;
-;;;; $Id: clsql-tests.asd,v 1.1 2003/05/02 03:05:54 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.
 ;;;; *************************************************************************
 
-(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
-  :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 "acl-compat-tester")
-	     (:file "package" :depends-on ("rt"))
-;;	     (:file "tables" :depends-on ("package")))
-	     (:file "tests" :depends-on ("package" "acl-compat-tester")))
-	    )))
+(eval-when (:compile-toplevel :load-toplevel :execute)
+  (unless (find-package '#:uffi)
+    (asdf:operate 'asdf:load-op 'uffi)))
 
-(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")))
+(defsystem clsql-tests
+    :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 "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-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")))