X-Git-Url: http://git.kpe.io/?p=clsql.git;a=blobdiff_plain;f=clsql-tests.asd;h=13a4c07c855db37b5db46b0cc912e7bd16dd5bbc;hp=afceb8c726a18ea03fafbdacd531ba19a458a83a;hb=8e7d3ca04beea7c047f3634b05dba813ee903919;hpb=c4ffac239e4910bff542dadf3212ad95803af64e

diff --git a/clsql-tests.asd b/clsql-tests.asd
index afceb8c..13a4c07 100644
--- a/clsql-tests.asd
+++ b/clsql-tests.asd
@@ -2,22 +2,23 @@
 ;;;; *************************************************************************
 ;;;; 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 ""
@@ -29,10 +30,20 @@
     ((:module tests
 	      :serial t
 	      :components ((:file "package")
+			   (:file "utils")
 			   (:file "test-init")
+			   (:file "benchmarks")
+			   (:file "test-time")
+			   (:file "test-basic")
 			   (: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))))
+  (operate 'load-op 'clsql)
+  (unless (funcall (intern (symbol-name '#:run-tests)
+			   (find-package '#:clsql-tests)))
+    (error "test-op failed")))