projects
/
clsql.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r10815: 11 Nov 2005 Kevin Rosenberg <kevin@rosenberg.net>
[clsql.git]
/
tests
/
utils.lisp
diff --git
a/tests/utils.lisp
b/tests/utils.lisp
index f6f4e5170366359461bc616907e25e0d0c98535a..948d75a53b034d517a6ed28b0ba734360bbb775e 100644
(file)
--- a/
tests/utils.lisp
+++ b/
tests/utils.lisp
@@
-1,4
+1,4
@@
-;;;
;
-*- Mode: LISP; Syntax: ANSI-Common-Lisp; Base: 10 -*-
+;;; -*- Mode: LISP; Syntax: ANSI-Common-Lisp; Base: 10 -*-
;;;; *************************************************************************
;;;; FILE IDENTIFICATION
;;;;
;;;; *************************************************************************
;;;; FILE IDENTIFICATION
;;;;
@@
-7,7
+7,7
@@
;;;; Author: Kevin M. Rosenberg
;;;; Created: Mar 2002
;;;;
;;;; Author: Kevin M. Rosenberg
;;;; Created: Mar 2002
;;;;
-;;;; $Id
: tests.lisp 8926 2004-04-10 21:12:52Z kevin
$
+;;;; $Id$
;;;;
;;;; This file, part of CLSQL, is Copyright (c) 2002-2004 by Kevin M. Rosenberg
;;;;
;;;;
;;;; This file, part of CLSQL, is Copyright (c) 2002-2004 by Kevin M. Rosenberg
;;;;
@@
-24,17
+24,18
@@
:type "config"))
(defvar +all-db-types+
:type "config"))
(defvar +all-db-types+
- #-clisp '(:postgresql :postgresql-socket :mysql :sqlite :odbc
- #+allegro :aodbc)
- #+clisp '(:sqlite))
+ '(:postgresql :postgresql-socket :mysql :sqlite :sqlite3 :odbc :oracle
+ #+allegro :aodbc))
(defclass conn-specs ()
((aodbc :accessor aodbc-spec :initform nil)
(defclass conn-specs ()
((aodbc :accessor aodbc-spec :initform nil)
- (odbc :accessor odbc-spec :initform nil)
(mysql :accessor mysql-spec :initform nil)
(postgresql :accessor postgresql-spec :initform nil)
(postgresql-socket :accessor postgresql-socket-spec :initform nil)
(mysql :accessor mysql-spec :initform nil)
(postgresql :accessor postgresql-spec :initform nil)
(postgresql-socket :accessor postgresql-socket-spec :initform nil)
- (sqlite :accessor sqlite-spec :initform nil))
+ (sqlite :accessor sqlite-spec :initform nil)
+ (sqlite3 :accessor sqlite3-spec :initform nil)
+ (odbc :accessor odbc-spec :initform nil)
+ (oracle :accessor oracle-spec :initform nil))
(:documentation "Connection specs for CLSQL testing"))
(:documentation "Connection specs for CLSQL testing"))
@@
-58,14
+59,6
@@
(defun db-type-spec (db-type specs)
(funcall (spec-fn db-type) specs))
(defun db-type-spec (db-type specs)
(funcall (spec-fn db-type) specs))
-(defun db-type-ensure-system (db-type)
- (unless (find-package (symbol-name db-type))
- (asdf:operate 'asdf:load-op
- (intern (concatenate 'string
- (symbol-name '#:clsql-)
- (symbol-name db-type))))))
-
-
(defun summarize-test-report (sexp &optional (output *standard-output*))
(flet ((db-title (db-type underlying-db-type)
(defun summarize-test-report (sexp &optional (output *standard-output*))
(flet ((db-title (db-type underlying-db-type)
@@
-87,13
+80,16
@@
impl-version
machine-type)
form
impl-version
machine-type)
form
+ (declare (ignorable utime impl-version))
(if failed-tests
(if failed-tests
- (format output "~&~A: ~D of ~D tests failed (~A).~&"
+ (format output "~&~A: ~D of ~D tests failed (~A
, ~A
).~&"
(db-title db-type underlying-db-type)
(length failed-tests)
total-tests
(db-title db-type underlying-db-type)
(length failed-tests)
total-tests
+ machine-type
impl-type)
impl-type)
- (format output "~&~A: All ~D tests passed (~A).~%"
+ (format output "~&~A: All ~D tests passed (~A
, ~A
).~%"
(db-title db-type underlying-db-type)
total-tests
(db-title db-type underlying-db-type)
total-tests
+ machine-type
impl-type))))))))
impl-type))))))))