Changeset 12335

Timestamp:

01/05/10 17:15:35 (13 years ago)

Author:

Mark Evenson

Message:

Initial fix for support for running cl-bench test suite from Ant build via ASDF.

This probably doesn't work on win32 without 'make' in your path.

Running the cl-bench suite now works via the 'test.cl-bench' target if
the test suite has been downloaded from
"​http://www.chez.com/emarsden/downloads/cl-bench.tar.gz" and placed in
a sibling directory (#p../cl-bench/) to ABCL root.

Move the cl-bench ASDF description into 'abcl.asd' now that I have
finally understood (?) the correct CLOS method invocation.

Location:

trunk/abcl

Files:

• abcl.asd (modified) (2 diffs)
• build.xml (modified) (1 diff)
• test/lisp/cl-bench/cl-bench.asd (deleted)
• test/lisp/cl-bench/wrapper.lisp (added)

trunk/abcl/abcl.asd

@@ -24 +24 @@
 
 (defmethod perform :after ((o load-op) (c (eql (find-system :abcl))))
-  #+nil (asdf:oos 'asdf:test-op :cl-bench :force t)
+  (operate 'load-op :cl-bench :force t)
   (operate 'load-op :abcl-test-lisp :force t)
   (operate 'load-op :ansi-compiled :force t)
   (operate 'load-op :ansi-interpreted :force t))
 
+#+nil
 (defmethod perform :before ((o load-op) (c t))
   (warn "ASDF load-op class is ~A" c))
@@ -69 +70 @@
    "Invoke tests with (asdf:oos 'asdf:test-op :abcl-test-lisp)."
    (funcall (intern (symbol-name 'run) :abcl-test)))
+
+(defsystem :cl-bench :components
+  ((:module cl-bench-wrapper :pathname "test/lisp/cl-bench/" :components 
+            ((:file "wrapper")))))
+
+(defmethod perform :before ((o test-op) (c (eql (find-system :cl-bench))))
+  (operate 'load-op :cl-bench :force t))
+
+(defmethod perform ((o test-op) (c (eql (find-system :cl-bench))))
+  (funcall (intern (symbol-name 'run) :abcl.test.cl-bench)))
  
 ;;; Build ABCL from a Lisp.

trunk/abcl/build.xml

@@ -666 +666 @@
     </target>
 
+    <target name="test.cl-bench" 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="--eval"/><arg value="(require (quote asdf))"/>
+  <arg value="--eval"/><arg value="(asdf:operate (quote asdf:load-op) :abcl)"/>
+  <arg value="--eval"/><arg value="(asdf:operate (quote asdf:test-op) :cl-bench)"/>
+      </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"/> 
 <!--    <import file="j-build.xml" optional="true"/>  -->