[armedbear-cvs] r11605 - in trunk/abcl: . src/org/armedbear/lisp test/lisp/abcl

[Mark Evenson]

Author: mevenson
Date: Fri Jan 30 15:40:57 2009
New Revision: 11605

Log:
ABCL included Lisp tests now working from ASDF and Ant.

The following targets now work from Ant:

    'test.ansi.compiled'
    'test.ansi.intepreted'
    'test.abcl.lisp'

invoking the GCL ANSI tests compiled, GCL ANSI tests interpreted, and the internal ABCL tests.

Packaged the internal ANSI Lisp test use of REGRESSION-TEST as
ABCL-REGRESSION-TEST (nickname abcl-rt) to avoid conflicting with
other test suites that use this.



Modified:
   trunk/abcl/abcl.asd
   trunk/abcl/build.xml
   trunk/abcl/src/org/armedbear/lisp/Version.java
   trunk/abcl/test/lisp/abcl/java-tests.lisp

Modified: trunk/abcl/abcl.asd
==============================================================================
--- trunk/abcl/abcl.asd	(original)
+++ trunk/abcl/abcl.asd	Fri Jan 30 15:40:57 2009
@@ -47,7 +47,10 @@
 	   :compile-tests t))
 
 (defsystem :abcl-test-lisp :version "1.0" :components
-	   ((:module package  :pathname "test/lisp/abcl/" :components
+	   ((:module abcl-rt :pathname "test/lisp/abcl/" :serial t :components
+		     ((:file "rt-package") (:file "rt")))
+	    (: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)."

Modified: trunk/abcl/build.xml
==============================================================================
--- trunk/abcl/build.xml	(original)
+++ trunk/abcl/build.xml	Fri Jan 30 15:40:57 2009
@@ -37,7 +37,7 @@
       <echo>Corresponding targets for J have been removed.</echo>
     </target>
 
-    <!-- Checks if JSR-223 support is available - thanks to Mark Everson -->
+    <!-- Checks if JSR-223 support is available - thanks to Mark Evenson -->
     <available property="abcl.jsr-223.p"
 	       classname="javax.script.ScriptEngine"/>
 
@@ -98,6 +98,13 @@
 	<format property="build" pattern="EEE MMM dd yyyy HH:mm:ss zzz"/>
       </tstamp>
 
+      <tstamp>
+	<format property="build.stamp" pattern="yyyymmdd-HHmm"/>
+      </tstamp>
+
+      <property name="abcl.test.log.file"
+		value="abcl-test-${build.stamp}.log"/>
+
       <!--- antversion fails in ant 1.7.1 <antversion property="ant.version" 
 	                                              atleast="1.7"/> -->
       <property name="java.path"
@@ -489,13 +496,12 @@
     </target>
 
     <target name="abcl.test.lisp" 
-	    depends="abcl.test.lisp.asdf"/>
+	    depends="test.ansi.compiled,test.abcl"/>
 
-    <target name="abcl.test.lisp.asdf" 
-	    depends="abcl.jar,abcl.test.ansi.compiled">
-    </target>
 
-    <target name="abcl.test.ansi.interpreted">
+    <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"/>
       <java fork="true" dir="${basedir}"
 	    classpathref="abcl.classpath.dist"
 	    classname="org.armedbear.lisp.Main">
@@ -503,14 +509,13 @@
 	<arg value="--load"/>
 	<arg line="${basedir}/test/lisp/ansi/ansi-tests-interpreted.lisp"/>
       </java>
+      <record name="${abcl.test.log.file}" emacsmode="true" action="stop"/>
+      <echo>Finished recording test output in ${abcl.test.log.file}.</echo>
     </target>
 
-    <property name="abcl.test.log.file"
-	      value="abcl.test.ansi.compiled.${version.src}"/>
-
-    <target name="abcl.test.ansi.compiled">
+    <target name="test.ansi.compiled" depends="abcl.jar">
       <echo>Recording test output in ${abcl.test.log.file}.</echo>
-      <record name="${abcl.test.log.file}" emacsmode="true" action="start"/>
+      <record name="${abcl.test.log.file}" emacsmode="true" action="start" append="yes"/>
       <java fork="true" dir="${basedir}"
 	    classpathref="abcl.classpath.dist"
 	    classname="org.armedbear.lisp.Main">
@@ -519,8 +524,21 @@
  	<arg line="${basedir}/test/lisp/ansi/ansi-tests-compiled.lisp "/> 
       </java>
       <record name="${abcl.test.log.file}" emacsmode="true" action="stop"/>
-      <echo>Finished ecording test output in ${abcl.test.log.file}.</echo>
+      <echo>Finished recording test output in ${abcl.test.log.file}.</echo>
+    </target>
 
+    <target name="test.abcl" 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"/>
+      <java fork="true" dir="${basedir}"
+	    classpathref="abcl.classpath.dist"
+	    classname="org.armedbear.lisp.Main">
+	<arg value="--noinit"/> 
+	<arg value="--load"/>
+ 	<arg line="${basedir}/test/lisp/abcl/abcl-test.lisp"/>
+      </java>
+      <record name="${abcl.test.log.file}" emacsmode="true" action="stop"/>
+      <echo>Finished recording test output in ${abcl.test.log.file}.</echo>
     </target>
 
     <import file="netbeans-build.xml" optional="true"/> 

Modified: trunk/abcl/src/org/armedbear/lisp/Version.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/Version.java	(original)
+++ trunk/abcl/src/org/armedbear/lisp/Version.java	Fri Jan 30 15:40:57 2009
@@ -41,6 +41,6 @@
 
   public static String getVersion()
   {
-    return "0.13.0-dev";
+    return "0.12.37";
   }
 }

Modified: trunk/abcl/test/lisp/abcl/java-tests.lisp
==============================================================================
--- trunk/abcl/test/lisp/abcl/java-tests.lisp	(original)
+++ trunk/abcl/test/lisp/abcl/java-tests.lisp	Fri Jan 30 15:40:57 2009
@@ -19,8 +19,8 @@
 
 (in-package #:abcl.test.lisp)
 
-;#+abcl
-;(use-package '#:java)
+#+abcl
+(use-package '#:java)
 
 #+allegro
 (require :jlinker)