diff options
| author | Gilles Dubochet <gilles.dubochet@epfl.ch> | 2008-05-09 15:47:25 +0000 |
|---|---|---|
| committer | Gilles Dubochet <gilles.dubochet@epfl.ch> | 2008-05-09 15:47:25 +0000 |
| commit | f02cc551dcd5228ebb463be80c63c796c6f4a8cc (patch) | |
| tree | 02f86a93446408c9ebb697c08c68d93fb60baec9 /src/build/four.xml | |
| parent | 4d07c3dac6fee9afa1c3eb3ab246c339a703f740 (diff) | |
| download | scala-f02cc551dcd5228ebb463be80c63c796c6f4a8cc.tar.gz scala-f02cc551dcd5228ebb463be80c63c796c6f4a8cc.tar.bz2 scala-f02cc551dcd5228ebb463be80c63c796c6f4a8cc.zip | |
Added “fourfour” targets to SuperSabbus for tes...
Added “fourfour” targets to SuperSabbus for testing JVM 1.4 builds
with a 1.4 JVM. Removed obsolete build files.
Diffstat (limited to 'src/build/four.xml')
| -rw-r--r-- | src/build/four.xml | 43 |
1 files changed, 41 insertions, 2 deletions
diff --git a/src/build/four.xml b/src/build/four.xml index 6dd92f34f4..a47ce57927 100644 --- a/src/build/four.xml +++ b/src/build/four.xml @@ -290,11 +290,14 @@ DOCUMENTATION </target> <!-- =========================================================================== -BOOTRAPING TEST AND TEST SUITE +TEST SUITE WHEN RUN ON JVM 1.5 +================================================================================ +This tests how a compiler, library and tests that where targeted for JVM 1.4 +work on a JVM 1.5. ============================================================================ --> <target name="four-test.suite" depends="four-pack.done"> - <partest showlog="yes" erroronfailed="no" scalacopts="-target:jvm-1.4"> + <partest showlog="yes" erroronfailed="no" scalacopts="-target:jvm-1.4" javacmd="${java.home}/bin/java"> <classpath> <pathelement location="${build-four-pack.dir}/lib/scala-library.jar"/> <pathelement location="${build-four-pack.dir}/lib/scala-compiler.jar"/> @@ -311,6 +314,42 @@ BOOTRAPING TEST AND TEST SUITE </target> <target name="four-test.done" depends="four-test.suite"/> + +<!-- =========================================================================== +TEST SUITE WHEN RUN ON JVM 1.4 (standalone) +================================================================================ +This tests how a compiler, library and tests that where targeted for JVM 1.4 +work on a JVM 1.4. +============================================================================ --> + + <target name="fourfour-test.start"> + <path id="four-pack.classpath"> + <pathelement location="${build-four-pack.dir}/lib/scala-library.jar"/> + <pathelement location="${build-four-pack.dir}/lib/scala-compiler.jar"/> + <pathelement location="${build-four-pack.dir}/lib/scala-partest.jar"/> + <pathelement location="${ant.jar}"/> + </path> + <taskdef resource="scala/tools/partest/antlib.xml" classpathref="four-pack.classpath"/> + </target> + + <target name="fourfour-test.suite" depends="fourfour-test.start"> + <partest showlog="yes" erroronfailed="no" scalacopts="-target:jvm-1.4" javacmd="${java.home}/bin/java"> + <classpath> + <pathelement location="${build-four-pack.dir}/lib/scala-library.jar"/> + <pathelement location="${build-four-pack.dir}/lib/scala-compiler.jar"/> + <fileset dir="${test.dir}/files/lib" includes="*.jar"/> + </classpath> + <postests dir="${test.dir}/files/pos" includes="*.scala"/> + <negtests dir="${test.dir}/files/neg" includes="*.scala"/> + <runtests dir="${test.dir}/files"> + <include name="run/**/*.scala"/> + <include name="jvm/**/*.scala"/> + </runtests> + <residenttests dir="${test.dir}/files/res" includes="*.res"/> + </partest> + </target> + + <target name="fourfour-test.done" depends="fourfour-test.suite"/> <!-- =========================================================================== DISTRIBUTION |