Changeset 12016

Timestamp:

06/13/09 14:48:45 (14 years ago)

Author:

Mark Evenson

Message:

Fix current directory problems with ABCL Lisp-based test suite.

Now the ABCL Lisp-based test suite (invoked form ant via 'ant
test.abcl') reports 7 out of 228 tests failing (x64-darwin-9.7.0 on
apple-jdk-1.5.0_16).

Location:

trunk/abcl

Files:

• abcl.asd (modified) (1 diff)
• build.xml (modified) (1 diff)
• test/lisp/abcl/package.lisp (modified) (2 diffs)

trunk/abcl/abcl.asd

@@ -53 +53 @@
          :pathname "test/lisp/abcl/" :components
          ((:file "package")))))
+
 (defmethod perform ((o test-op) (c (eql (find-system 'abcl-test-lisp))))
-   "Invoke tests with:  (asdf:oos 'asdf:test-op :abcl-tests :force t)."
+   "Invoke tests with:  (asdf:oos 'asdf:test-op :abcl-test-lisp :force t)."
    ;;; FIXME needs ASDF:OOS to be invoked with :FORCE t
    (funcall (intern (symbol-name 'run) :abcl.test.lisp)))

trunk/abcl/build.xml

@@ -504 +504 @@
       depends="test.ansi.compiled,test.abcl"/>
 
-
     <target name="test.ansi.interpreted" depends="abcl.jar">
       <echo>Recording test output in ${abcl.test.log.file}.</echo>

trunk/abcl/test/lisp/abcl/package.lisp

@@ -4 +4 @@
 (in-package #:abcl.test.lisp)
 
-(defparameter *abcl-lisp-test-pathname* nil)
-
-(eval-when (:load-toplevel)
-  (setf *abcl-lisp-test-pathname* *load-truename*))
+(defvar *abcl-lisp-test-directory* 
+  (pathname (directory-namestring *load-truename*))
+  "The directory in which the ABCL test source files are located.")
 
 (defun run ()
-  (progv 
-      '(*default-pathname-defaults*)
-      `(,(merge-pathnames *abcl-lisp-test-pathname* *default-pathname-defaults*))
+  "Run the Lisp test suite for ABCL."
+
+  (let ((*default-pathname-defaults* *abcl-lisp-test-directory*))
     (rem-all-tests)
 
@@ -26 +25 @@
     (do-tests)))
 
-
-
-   
-
-