Changeset 12335


Ignore:
Timestamp:
01/05/10 17:15:35 (11 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:
1 added
1 deleted
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/abcl/abcl.asd

    r12301 r12335  
    2424
    2525(defmethod perform :after ((o load-op) (c (eql (find-system :abcl))))
    26   #+nil (asdf:oos 'asdf:test-op :cl-bench :force t)
     26  (operate 'load-op :cl-bench :force t)
    2727  (operate 'load-op :abcl-test-lisp :force t)
    2828  (operate 'load-op :ansi-compiled :force t)
    2929  (operate 'load-op :ansi-interpreted :force t))
    3030
     31#+nil
    3132(defmethod perform :before ((o load-op) (c t))
    3233  (warn "ASDF load-op class is ~A" c))
     
    6970   "Invoke tests with (asdf:oos 'asdf:test-op :abcl-test-lisp)."
    7071   (funcall (intern (symbol-name 'run) :abcl-test)))
     72
     73(defsystem :cl-bench :components
     74  ((:module cl-bench-wrapper :pathname "test/lisp/cl-bench/" :components
     75            ((:file "wrapper")))))
     76
     77(defmethod perform :before ((o test-op) (c (eql (find-system :cl-bench))))
     78  (operate 'load-op :cl-bench :force t))
     79
     80(defmethod perform ((o test-op) (c (eql (find-system :cl-bench))))
     81  (funcall (intern (symbol-name 'run) :abcl.test.cl-bench)))
    7182 
    7283;;; Build ABCL from a Lisp.
  • trunk/abcl/build.xml

    r12333 r12335  
    666666    </target>
    667667
     668    <target name="test.cl-bench" depends="abcl.jar">
     669      <echo>Recording test output in ${abcl.test.log.file}.</echo>
     670      <record name="${abcl.test.log.file}" emacsmode="true" action="start" append="yes"/>
     671      <java fork="true" dir="${basedir}"
     672      classpathref="abcl.classpath.dist"
     673      classname="org.armedbear.lisp.Main">
     674  <arg value="--noinit"/>
     675  <arg value="--eval"/><arg value="(require (quote asdf))"/>
     676  <arg value="--eval"/><arg value="(asdf:operate (quote asdf:load-op) :abcl)"/>
     677  <arg value="--eval"/><arg value="(asdf:operate (quote asdf:test-op) :cl-bench)"/>
     678      </java>
     679      <record name="${abcl.test.log.file}" emacsmode="true" action="stop"/>
     680      <echo>Finished recording test output in ${abcl.test.log.file}.</echo>
     681    </target>
     682
     683
    668684    <import file="netbeans-build.xml" optional="true"/>
    669685<!--    <import file="j-build.xml" optional="true"/>  -->
Note: See TracChangeset for help on using the changeset viewer.