diff options
| author | Gilles Dubochet <gilles.dubochet@epfl.ch> | 2008-04-29 14:30:21 +0000 |
|---|---|---|
| committer | Gilles Dubochet <gilles.dubochet@epfl.ch> | 2008-04-29 14:30:21 +0000 |
| commit | 006394362f79dd5dc6c39cd793db488767ae0027 (patch) | |
| tree | da0c98bbcf9dedfc881829e2ec4723f19c55a627 | |
| parent | 1ecd751ef767bf79a46abcd25f6f297d1876682d (diff) | |
| download | scala-006394362f79dd5dc6c39cd793db488767ae0027.tar.gz scala-006394362f79dd5dc6c39cd793db488767ae0027.tar.bz2 scala-006394362f79dd5dc6c39cd793db488767ae0027.zip | |
SuperSabbus uses proper Java command to run par...
SuperSabbus uses proper Java command to run partest. Added targets for
nightly tasks.
| -rw-r--r-- | sabbus.xml | 17 | ||||
| -rw-r--r-- | src/partest/scala/tools/partest/PartestTask.scala | 3 |
2 files changed, 19 insertions, 1 deletions
diff --git a/sabbus.xml b/sabbus.xml index 2d4dfa1196..b8d37d0c40 100644 --- a/sabbus.xml +++ b/sabbus.xml @@ -843,7 +843,7 @@ BOOTRAPING TEST AND TEST SUITE </target> <target name="test.suite" depends="pack.done"> - <partest showlog="yes" erroronfailed="yes"> + <partest showlog="yes" erroronfailed="yes" javacmd="${java.home}/bin/java"> <classpath> <path refid="pack.classpath"/> <fileset dir="${test.dir}/files/lib" includes="*.jar"/> @@ -1001,6 +1001,21 @@ FORWARDED TARGETS FOR PACKAGING </target> <!-- =========================================================================== +FORWARDED TARGETS FOR NIGHTLY BUILDS +============================================================================ --> + + <target name="nightly" depends="all.done"> + <ant antfile="${src.dir}/build/pack.xml" target="pack-all.done" inheritall="yes" inheritrefs="yes"/> + </target> + + <target name="fournightly" depends="pack.done"> + <ant antfile="${src.dir}/build/four.xml" target="four-all.done" inheritall="yes" inheritrefs="yes"/> + <ant antfile="${src.dir}/build/pack.xml" target="fourpack-all.done" inheritall="yes" inheritrefs="yes"/> + </target> + + <target name="msilnightly"/> + +<!-- =========================================================================== MISCELLANEOUS ============================================================================ --> diff --git a/src/partest/scala/tools/partest/PartestTask.scala b/src/partest/scala/tools/partest/PartestTask.scala index d28c9aabcf..9c17d200fc 100644 --- a/src/partest/scala/tools/partest/PartestTask.scala +++ b/src/partest/scala/tools/partest/PartestTask.scala @@ -55,6 +55,9 @@ class PartestTask extends Task { def setErrorOnFailed(input: Boolean): Unit = errorOnFailed = input + def setJavaCmd(input: File): Unit = + javacmd = Some(input) + private var classpath: Option[Path] = None private var javacmd: Option[File] = None private var showDiff: Boolean = false |