diff options
| author | Paul Phillips <paulp@improving.org> | 2013-03-06 08:41:37 -0800 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-03-09 11:59:11 -0800 |
| commit | 9604770e0a08ac9c4892e90c9ed3636784f11efd (patch) | |
| tree | 1d16eef19d589372d1b00247ac422d507d752138 /build.xml | |
| parent | 2fd8e72a2ffd7bb5b029d78ea670df5beae54294 (diff) | |
| download | scala-9604770e0a08ac9c4892e90c9ed3636784f11efd.tar.gz scala-9604770e0a08ac9c4892e90c9ed3636784f11efd.tar.bz2 scala-9604770e0a08ac9c4892e90c9ed3636784f11efd.zip | |
Give interactive tests their own target.
% ant test.interactive
Diffstat (limited to 'build.xml')
| -rw-r--r-- | build.xml | 33 |
1 files changed, 19 insertions, 14 deletions
@@ -2320,8 +2320,11 @@ BOOTRAPING TEST AND TEST SUITE </antcall> </target> - <target name="test.run" depends="pack.done"> + <target name="test.pre-run" depends="pack.done"> <property name="partest.srcdir" value="files" /> + </target> + + <target name="test.run" depends="test.pre-run"> <partest showlog="yes" erroronfailed="yes" javacmd="${java.home}/bin/java" timeout="1200000" srcdir="${partest.srcdir}" @@ -2333,7 +2336,7 @@ BOOTRAPING TEST AND TEST SUITE </partest> </target> - <target name="test.ant" depends="pack.done"> + <target name="test.ant" depends="test.pre-run"> <property name="partest.srcdir" value="files" /> <partest showlog="yes" erroronfailed="yes" javacmd="${java.home}/bin/java" srcdir="${partest.srcdir}" @@ -2343,7 +2346,7 @@ BOOTRAPING TEST AND TEST SUITE </partest> </target> - <target name="test.suite" depends="pack.done"> + <target name="test.suite" depends="test.pre-run"> <property name="partest.srcdir" value="files" /> <partest showlog="yes" erroronfailed="yes" javacmd="${java.home}/bin/java" timeout="2400000" @@ -2365,14 +2368,10 @@ BOOTRAPING TEST AND TEST SUITE <instrumentedtests dir="${partest.dir}/${partest.srcdir}/instrumented"> <include name="*.scala"/> </instrumentedtests> - <presentationtests dir="${partest.dir}/${partest.srcdir}/presentation"> - <include name="*/*.scala"/> - </presentationtests> - <!-- <scripttests dir="${partest.dir}/${partest.srcdir}/script" includes="*.scala"/> --> </partest> </target> - <target name="test.continuations.suite" depends="pack.done"> + <target name="test.continuations.suite" depends="test.pre-run"> <property name="partest.srcdir" value="files" /> <partest showlog="yes" erroronfailed="yes" javacmd="${java.home}/bin/java" timeout="2400000" @@ -2386,18 +2385,24 @@ BOOTRAPING TEST AND TEST SUITE </partest> </target> - <target name="test.scaladoc" depends="pack.done"> + <target name="test.scaladoc" depends="test.pre-run"> <partest erroronfailed="yes" scalacopts="${scalac.args.optimise}" showlog="yes"> - <compilationpath> - <path refid="partest.classpath"/> - <pathelement location="${build-quick.dir}/classes/scaladoc"/> - </compilationpath> + <compilationpath refid="partest.classpath"/> <runtests dir="${partest.dir}/scaladoc/run" includes="*.scala" /> <scalachecktests dir="${partest.dir}/scaladoc/scalacheck" includes="*.scala" /> </partest> </target> - <target name="test.done" depends="test.suite, test.continuations.suite, test.scaladoc, test.stability, test.sbt"/> + <target name="test.interactive" depends="test.pre-run"> + <partest erroronfailed="yes" scalacopts="${scalac.args.optimise}" showlog="yes"> + <compilationpath refid="partest.classpath"/> + <presentationtests dir="${partest.dir}/${partest.srcdir}/presentation"> + <include name="*/*.scala"/> + </presentationtests> + </partest> + </target> + + <target name="test.done" depends="test.suite, test.continuations.suite, test.scaladoc, test.interactive, test.stability, test.sbt"/> <!-- =========================================================================== |