r10077: * multiple: Apply patch from Joerg Hoehle with multiple

[clsql.git] / clsql-tests.asd

diff --git a/clsql-tests.asd b/clsql-tests.asd
index 7a7d6d9b6da392e320c9f469a68ebba098e334cb..9d4df2f67e4c223ce5c13b7b7fedfdf77915a0b6 100644 (file)
--- a/clsql-tests.asd
+++ b/clsql-tests.asd
@@ -7,17 +7,16 @@
 ;;;; 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)
 
 (defsystem clsql-tests
     :name "CLSQL Tests"
@@ -31,7 +30,12 @@
     ((: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")
@@ -40,8 +44,7 @@
                           (:file "test-syntax")))))
 
 (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")))