Update of /project/elephant/cvsroot/elephant/tests In directory clnet:/tmp/cvs-serv14219/tests Modified Files: testbdb.lisp Log Message: Fix bug where BDB tests failing with running SQL backend tests; initial x86/64-bit support for CMUCL/SBCL --- /project/elephant/cvsroot/elephant/tests/testbdb.lisp 2006/11/11 18:41:11 1.1 +++ /project/elephant/cvsroot/elephant/tests/testbdb.lisp 2006/11/11 22:53:13 1.2 @@ -11,7 +11,7 @@ ;;; 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 "ELE-TESTS") +(in-package :ele-tests) (defvar env) @@ -29,7 +29,10 @@ (deftest prepares-bdb (progn - (if (find-package :db-bdb) + (setq db nil) + (if (and (find-package :db-bdb) + (eq (first (elephant::controller-spec *store-controller*)) + :BDB)) (finishes (prepare-bdb)) (progn (format t "Berkeley DB not loaded, so not runnning test prepares-bdb~%") @@ -77,11 +80,11 @@ finally (db-bdb::db-sequence-remove seq :auto-commit t)))) (deftest test-seq1 - (if (not (find-package :db-bdb)) + (if (not db) (progn (format t "Berkeley db not loaded, so not runnning test test-seq1~%") - t) - (finishes (test-sequence1))) + t) + (finishes (test-sequence1))) t) (defun test-sequence2 () @@ -118,8 +121,8 @@ (if (not db) (progn (format t "Berkeley DB not open, so not runnning test cleanup-bdb~%") - t) - (finishes (cleanup-bdb))) + t) + (finishes (cleanup-bdb))) t) ;;(unuse-package "DB-BDB")