Changeset 11605


Ignore:
Timestamp:
01/30/09 15:40:57 (12 years ago)
Author:
Mark Evenson
Message:

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.

Location:
trunk/abcl
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/abcl/abcl.asd

    r11599 r11605  
    4848
    4949(defsystem :abcl-test-lisp :version "1.0" :components
    50      ((:module package  :pathname "test/lisp/abcl/" :components
     50     ((:module abcl-rt :pathname "test/lisp/abcl/" :serial t :components
     51         ((:file "rt-package") (:file "rt")))
     52      (:module package  :depends (abcl-rt)
     53         :pathname "test/lisp/abcl/" :components
    5154         ((:file "package")))))
    5255(defmethod perform ((o test-op) (c (eql (find-system 'abcl-test-lisp))))
  • trunk/abcl/build.xml

    r11596 r11605  
    3838    </target>
    3939
    40     <!-- Checks if JSR-223 support is available - thanks to Mark Everson -->
     40    <!-- Checks if JSR-223 support is available - thanks to Mark Evenson -->
    4141    <available property="abcl.jsr-223.p"
    4242         classname="javax.script.ScriptEngine"/>
     
    9898  <format property="build" pattern="EEE MMM dd yyyy HH:mm:ss zzz"/>
    9999      </tstamp>
     100
     101      <tstamp>
     102  <format property="build.stamp" pattern="yyyymmdd-HHmm"/>
     103      </tstamp>
     104
     105      <property name="abcl.test.log.file"
     106    value="abcl-test-${build.stamp}.log"/>
    100107
    101108      <!--- antversion fails in ant 1.7.1 <antversion property="ant.version"
     
    490497
    491498    <target name="abcl.test.lisp"
    492       depends="abcl.test.lisp.asdf"/>
    493 
    494     <target name="abcl.test.lisp.asdf"
    495       depends="abcl.jar,abcl.test.ansi.compiled">
    496     </target>
    497 
    498     <target name="abcl.test.ansi.interpreted">
     499      depends="test.ansi.compiled,test.abcl"/>
     500
     501
     502    <target name="test.ansi.interpreted" depends="abcl.jar">
     503      <echo>Recording test output in ${abcl.test.log.file}.</echo>
     504      <record name="${abcl.test.log.file}" emacsmode="true" action="start" append="yes"/>
    499505      <java fork="true" dir="${basedir}"
    500506      classpathref="abcl.classpath.dist"
     
    504510  <arg line="${basedir}/test/lisp/ansi/ansi-tests-interpreted.lisp"/>
    505511      </java>
    506     </target>
    507 
    508     <property name="abcl.test.log.file"
    509         value="abcl.test.ansi.compiled.${version.src}"/>
    510 
    511     <target name="abcl.test.ansi.compiled">
     512      <record name="${abcl.test.log.file}" emacsmode="true" action="stop"/>
     513      <echo>Finished recording test output in ${abcl.test.log.file}.</echo>
     514    </target>
     515
     516    <target name="test.ansi.compiled" depends="abcl.jar">
    512517      <echo>Recording test output in ${abcl.test.log.file}.</echo>
    513       <record name="${abcl.test.log.file}" emacsmode="true" action="start"/>
     518      <record name="${abcl.test.log.file}" emacsmode="true" action="start" append="yes"/>
    514519      <java fork="true" dir="${basedir}"
    515520      classpathref="abcl.classpath.dist"
     
    520525      </java>
    521526      <record name="${abcl.test.log.file}" emacsmode="true" action="stop"/>
    522       <echo>Finished ecording test output in ${abcl.test.log.file}.</echo>
    523 
     527      <echo>Finished recording test output in ${abcl.test.log.file}.</echo>
     528    </target>
     529
     530    <target name="test.abcl" depends="abcl.jar">
     531      <echo>Recording test output in ${abcl.test.log.file}.</echo>
     532      <record name="${abcl.test.log.file}" emacsmode="true" action="start" append="yes"/>
     533      <java fork="true" dir="${basedir}"
     534      classpathref="abcl.classpath.dist"
     535      classname="org.armedbear.lisp.Main">
     536  <arg value="--noinit"/>
     537  <arg value="--load"/>
     538  <arg line="${basedir}/test/lisp/abcl/abcl-test.lisp"/>
     539      </java>
     540      <record name="${abcl.test.log.file}" emacsmode="true" action="stop"/>
     541      <echo>Finished recording test output in ${abcl.test.log.file}.</echo>
    524542    </target>
    525543
  • trunk/abcl/src/org/armedbear/lisp/Version.java

    r11529 r11605  
    4242  public static String getVersion()
    4343  {
    44     return "0.13.0-dev";
     44    return "0.12.37";
    4545  }
    4646}
  • trunk/abcl/test/lisp/abcl/java-tests.lisp

    r11599 r11605  
    2020(in-package #:abcl.test.lisp)
    2121
    22 ;#+abcl
    23 ;(use-package '#:java)
     22#+abcl
     23(use-package '#:java)
    2424
    2525#+allegro
Note: See TracChangeset for help on using the changeset viewer.