[armedbear-cvs] r11546 - trunk/abcl

[Mark Evenson]

Author: mevenson
Date: Mon Jan  5 10:56:01 2009
New Revision: 11546

Log:
More fixes for the Ant target 'abcl.test'.

For some odd reason, pathnames as arguments to <java> tags in Ant seem
very inconsistent.  We specify the pathname via the 'line' attribute
in <arg>, but would rather use the 'file' attribute.

The CLOS stuff in 'abcl.asd' still doesn't work correctly for unknown reasons.



Modified:
   trunk/abcl/abcl.asd   (contents, props changed)
   trunk/abcl/build.xml

Modified: trunk/abcl/abcl.asd
==============================================================================
--- trunk/abcl/abcl.asd	(original)
+++ trunk/abcl/abcl.asd	Mon Jan  5 10:56:01 2009
@@ -10,14 +10,12 @@
   :documentation "Wrapper for all ABCL ASDF definitions."
   :version "0.2.0")
 
-(defmethod perform :around ((o load-op) (c (eql (find-system 'abcl))))
-  (call-next-method)
-  (format t "DEBUG: load-op around :abcl.~%")
-  (asdf:oos 'asdf:load-op :test-abcl))
+(defmethod perform :after ((o load-op) (c (eql (find-system 'abcl))))
+  ;;; Additional test suite loads would go here.
+  (asdf:oos 'asdf:load-op :test-abcl :force t))
 
 (defmethod perform ((o test-op) (c (eql (find-system 'abcl))))
-  (format t "DEBUG: test-op :abcl.~%")
-  (asdf:oos 'asdf:load-op :test-abcl :force t)
+  ;;; Additional test suite invocations would go here.
   (asdf:oos 'asdf:test-op :ansi-test-compiled :force t))
 
 (defsystem :test-abcl

Modified: trunk/abcl/build.xml
==============================================================================
--- trunk/abcl/build.xml	(original)
+++ trunk/abcl/build.xml	Mon Jan  5 10:56:01 2009
@@ -460,9 +460,9 @@
       <java fork="true" dir="${basedir}"
 	    classpathref="abcl.classpath.dist"
 	    classname="org.armedbear.lisp.Main">
-	<arg value="--noinit"/>
+ 	<arg value="--noinit"/> 
 	<arg value="--load"/>
-	<arg value="${basedir}/scripts/ansi-tests-interpreted.lisp "/>
+	<arg line="${basedir}/scripts/ansi-tests-interpreted.lisp"/>
       </java>
     </target>
 
@@ -470,9 +470,9 @@
       <java fork="true" dir="${basedir}"
 	    classpathref="abcl.classpath.dist"
 	    classname="org.armedbear.lisp.Main">
-	<arg value="--noinit"/>
+	<arg value="--noinit"/> 
 	<arg value="--load"/>
-	<arg value="${basedir}/scripts/ansi-tests-compiled.lisp "/>
+ 	<arg line="${basedir}/scripts/ansi-tests-compiled.lisp "/> 
       </java>
     </target>