Skip to content

Commit

Permalink
Give interactive tests their own target.
Browse files Browse the repository at this point in the history
% ant test.interactive
  • Loading branch information
paulp authored and adriaanm committed Mar 9, 2013
1 parent 2fd8e72 commit 9604770
Showing 1 changed file with 19 additions and 14 deletions.
33 changes: 19 additions & 14 deletions build.xml
Expand Up @@ -2320,8 +2320,11 @@ BOOTRAPING TEST AND TEST SUITE
</antcall> </antcall>
</target> </target>


<target name="test.run" depends="pack.done"> <target name="test.pre-run" depends="pack.done">
<property name="partest.srcdir" value="files" /> <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" <partest showlog="yes" erroronfailed="yes" javacmd="${java.home}/bin/java"
timeout="1200000" timeout="1200000"
srcdir="${partest.srcdir}" srcdir="${partest.srcdir}"
Expand All @@ -2333,7 +2336,7 @@ BOOTRAPING TEST AND TEST SUITE
</partest> </partest>
</target> </target>


<target name="test.ant" depends="pack.done"> <target name="test.ant" depends="test.pre-run">
<property name="partest.srcdir" value="files" /> <property name="partest.srcdir" value="files" />
<partest showlog="yes" erroronfailed="yes" javacmd="${java.home}/bin/java" <partest showlog="yes" erroronfailed="yes" javacmd="${java.home}/bin/java"
srcdir="${partest.srcdir}" srcdir="${partest.srcdir}"
Expand All @@ -2343,7 +2346,7 @@ BOOTRAPING TEST AND TEST SUITE
</partest> </partest>
</target> </target>


<target name="test.suite" depends="pack.done"> <target name="test.suite" depends="test.pre-run">
<property name="partest.srcdir" value="files" /> <property name="partest.srcdir" value="files" />
<partest showlog="yes" erroronfailed="yes" javacmd="${java.home}/bin/java" <partest showlog="yes" erroronfailed="yes" javacmd="${java.home}/bin/java"
timeout="2400000" timeout="2400000"
Expand All @@ -2365,14 +2368,10 @@ BOOTRAPING TEST AND TEST SUITE
<instrumentedtests dir="${partest.dir}/${partest.srcdir}/instrumented"> <instrumentedtests dir="${partest.dir}/${partest.srcdir}/instrumented">
<include name="*.scala"/> <include name="*.scala"/>
</instrumentedtests> </instrumentedtests>
<presentationtests dir="${partest.dir}/${partest.srcdir}/presentation">
<include name="*/*.scala"/>
</presentationtests>
<!-- <scripttests dir="${partest.dir}/${partest.srcdir}/script" includes="*.scala"/> -->
</partest> </partest>
</target> </target>


<target name="test.continuations.suite" depends="pack.done"> <target name="test.continuations.suite" depends="test.pre-run">
<property name="partest.srcdir" value="files" /> <property name="partest.srcdir" value="files" />
<partest showlog="yes" erroronfailed="yes" javacmd="${java.home}/bin/java" <partest showlog="yes" erroronfailed="yes" javacmd="${java.home}/bin/java"
timeout="2400000" timeout="2400000"
Expand All @@ -2386,18 +2385,24 @@ BOOTRAPING TEST AND TEST SUITE
</partest> </partest>
</target> </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"> <partest erroronfailed="yes" scalacopts="${scalac.args.optimise}" showlog="yes">
<compilationpath> <compilationpath refid="partest.classpath"/>
<path refid="partest.classpath"/>
<pathelement location="${build-quick.dir}/classes/scaladoc"/>
</compilationpath>
<runtests dir="${partest.dir}/scaladoc/run" includes="*.scala" /> <runtests dir="${partest.dir}/scaladoc/run" includes="*.scala" />
<scalachecktests dir="${partest.dir}/scaladoc/scalacheck" includes="*.scala" /> <scalachecktests dir="${partest.dir}/scaladoc/scalacheck" includes="*.scala" />
</partest> </partest>
</target> </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"/>




<!-- =========================================================================== <!-- ===========================================================================
Expand Down

0 comments on commit 9604770

Please sign in to comment.