[armedbear-cvs] r12016 - in trunk/abcl: . test/lisp/abcl

[Mark Evenson]

Author: mevenson
Date: Sat Jun 13 10:48:45 2009
New Revision: 12016

Log:
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).



Modified:
   trunk/abcl/abcl.asd
   trunk/abcl/build.xml
   trunk/abcl/test/lisp/abcl/package.lisp

Modified: trunk/abcl/abcl.asd
==============================================================================
--- trunk/abcl/abcl.asd	(original)
+++ trunk/abcl/abcl.asd	Sat Jun 13 10:48:45 2009
@@ -52,8 +52,9 @@
 	    (:module package  :depends (abcl-rt)
 		     :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)))
  

Modified: trunk/abcl/build.xml
==============================================================================
--- trunk/abcl/build.xml	(original)
+++ trunk/abcl/build.xml	Sat Jun 13 10:48:45 2009
@@ -503,7 +503,6 @@
     <target name="abcl.test.lisp" 
 	    depends="test.ansi.compiled,test.abcl"/>
 
-
     <target name="test.ansi.interpreted" depends="abcl.jar">
       <echo>Recording test output in ${abcl.test.log.file}.</echo>
       <record name="${abcl.test.log.file}" emacsmode="true" action="start" append="yes"/>

Modified: trunk/abcl/test/lisp/abcl/package.lisp
==============================================================================
--- trunk/abcl/test/lisp/abcl/package.lisp	(original)
+++ trunk/abcl/test/lisp/abcl/package.lisp	Sat Jun 13 10:48:45 2009
@@ -3,15 +3,14 @@
   (:export #:run))
 (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)
 
     (load "test-utilities.lisp")
@@ -25,9 +24,4 @@
 
     (do-tests)))
 
-
-
-   
-
-
 	
\ No newline at end of file