diff options
| author | Philipp Haller <hallerp@gmail.com> | 2008-10-31 15:25:27 +0000 |
|---|---|---|
| committer | Philipp Haller <hallerp@gmail.com> | 2008-10-31 15:25:27 +0000 |
| commit | fa88dfe5cdc88779ed0734893cae538db833ccc4 (patch) | |
| tree | 437418b34d80947e3067b197aff70d6cf226d639 /build.xml | |
| parent | 448110ac1153d504795ed3b48cf5b8aa30d20410 (diff) | |
| download | scala-fa88dfe5cdc88779ed0734893cae538db833ccc4.tar.gz scala-fa88dfe5cdc88779ed0734893cae538db833ccc4.tar.bz2 scala-fa88dfe5cdc88779ed0734893cae538db833ccc4.zip | |
Fixed multi-file jvm5 tests.
Diffstat (limited to 'build.xml')
| -rw-r--r-- | build.xml | 17 |
1 files changed, 16 insertions, 1 deletions
@@ -1261,6 +1261,21 @@ BOOTRAPING TEST AND TEST SUITE </same> </target> + <target name="test.run" depends="pack.done"> + <partest showlog="yes" erroronfailed="yes" javacmd="${java.home}/bin/java" + timeout="1200000" javaccmd="${javac.cmd}"> + <classpath> + <path refid="pack.classpath"/> + <fileset dir="${test.dir}/files/lib" includes="*.jar"/> + </classpath> + <runtests dir="${test.dir}/files"> + <include name="run/**/*.scala"/> + <include name="jvm/**/*.scala"/> + </runtests> + <jvm5tests dir="${test.dir}/files/jvm5" includes="*.scala"/> + </partest> + </target> + <target name="test.suite" depends="pack.done"> <partest showlog="yes" erroronfailed="yes" javacmd="${java.home}/bin/java" timeout="1200000" javaccmd="${javac.cmd}"> @@ -1274,8 +1289,8 @@ BOOTRAPING TEST AND TEST SUITE <runtests dir="${test.dir}/files"> <include name="run/**/*.scala"/> <include name="jvm/**/*.scala"/> - <include name="jvm5/**/*.scala"/> </runtests> + <jvm5tests dir="${test.dir}/files/jvm5" includes="*.scala"/> <residenttests dir="${test.dir}/files/res" includes="*.res"/> <!-- <scripttests dir="${test.dir}/files/script" includes="*.scala"/> --> </partest> |