X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=tests%2Ftest-init.lisp;h=1a274d918ef108621617f2d5a7cded81973348f5;hb=72c5d9d0555b01290409dc2607935db823fa1f10;hp=89b6ce204ff7638aa5d1ba8e1ba23ee42a364931;hpb=67e6b9eaab9c9bcf8b57cbd476581437e4876b26;p=clsql.git

diff --git a/tests/test-init.lisp b/tests/test-init.lisp
index 89b6ce2..1a274d9 100644
--- a/tests/test-init.lisp
+++ b/tests/test-init.lisp
@@ -4,28 +4,11 @@
 ;;;; Authors: Marcus Pearce <m.t.pearce@city.ac.uk>, Kevin Rosenberg
 ;;;; Created: 30/03/2004
 ;;;; Updated: $Id$
-;;;; ======================================================================
-;;;;
-;;;; Description ==========================================================
-;;;; ======================================================================
 ;;;;
 ;;;; Initialisation utilities for running regression tests on CLSQL. 
 ;;;;
 ;;;; ======================================================================
 
-;;; This test suite looks for a configuration file named ".clsql-test.config"
-;;; located in the users home directory.
-;;;
-;;; This file contains a single a-list that specifies the connection
-;;; specs for each database type to be tested. For example, to test all
-;;; platforms, a sample "test.config" may look like:
-;;;
-;;; ((:mysql ("localhost" "a-mysql-db" "user1" "secret"))
-;;;  (:aodbc ("my-dsn" "a-user" "pass"))
-;;;  (:postgresql ("localhost" "another-db" "user2" "dont-tell"))
-;;;  (:postgresql-socket ("pg-server" "a-db-name" "user" "secret-password"))
-;;;  (:sqlite ("path-to-sqlite-db")))
-
 (in-package #:clsql-tests)
 
 (defvar *rt-connection*)
@@ -314,12 +297,19 @@
     (dolist (db-type +all-db-types+)
       (let ((spec (db-type-spec db-type specs)))
 	(when spec
+	  (format t 
+"~&
+*******************************************************************
+***     Running CLSQL tests with ~A backend.
+*******************************************************************
+" db-type)
 	  (db-type-ensure-system db-type)
-	  (rt:rem-all-tests)
+	  (regression-test:rem-all-tests)
+	  (ignore-errors (destroy-database spec :database-type db-type))
+	  (ignore-errors (create-database spec :database-type db-type))
 	  (dolist (test (append *rt-connection* *rt-fddl* *rt-fdml*
 				*rt-ooddl* *rt-oodml* *rt-syntax*))
 	    (eval test))
-	  (format t "~&Running CLSQL tests with ~A backend.~%" db-type)
 	  (test-connect-to-database db-type spec)
 	  (test-initialise-database)
 	  (rtest:do-tests))))))