summaryrefslogtreecommitdiff
path: root/build.xml
diff options
context:
space:
mode:
authorIulian Dragos <jaguarul@gmail.com>2008-11-20 11:07:10 +0000
committerIulian Dragos <jaguarul@gmail.com>2008-11-20 11:07:10 +0000
commit283bc03d95aac65dc94db98de6fb2a5533bd2352 (patch)
tree514bf17605fe3f83a6a54be418c205d1785abb26 /build.xml
parente7f006fe9ac038e170b58659b2cedbd39ae525cb (diff)
downloadscala-283bc03d95aac65dc94db98de6fb2a5533bd2352.tar.gz
scala-283bc03d95aac65dc94db98de6fb2a5533bd2352.tar.bz2
scala-283bc03d95aac65dc94db98de6fb2a5533bd2352.zip
Added optimised.test target
Diffstat (limited to 'build.xml')
-rw-r--r--build.xml37
1 files changed, 36 insertions, 1 deletions
diff --git a/build.xml b/build.xml
index dff870f8bd..cb5e17e4f2 100644
--- a/build.xml
+++ b/build.xml
@@ -19,6 +19,9 @@ END-USER TARGETS
<target name="test" depends="test.done"
description="Runs test suite and bootstrapping test on Scala compiler and library."/>
+ <target name="optimised.test" depends="optimised.test.done"
+ description="Runs test suite and bootstrapping test on the optimised Scala compiler and library."/>
+
<target name="docs" depends="docs.done"
description="Builds documentation for the Scala library. Scaladoc is in 'build/scaladoc/library'."/>
@@ -1120,7 +1123,15 @@ OPTIMISED COMPILER
<touch file="${build-optimised.dir}/bin.complete" verbose="no"/>
</target>
- <target name="optimised.done" depends="optimised.bin"/>
+ <target name="optimised.done" depends="optimised.bin">
+ <path id="optimised.classpath">
+ <pathelement location="${build-optimised.dir}/classes/library"/>
+ <pathelement location="${build-optimised.dir}/classes/compiler"/>
+ <pathelement location="${build-optimised.dir}/classes/partest"/>
+ <pathelement location="${fjbg.jar}"/>
+ <pathelement location="${ant.jar}"/>
+ </path>
+ </target>
<target name="optimised.clean">
<delete dir="${build-optimised.dir}" includeemptydirs="yes" quiet="yes" failonerror="no"/>
@@ -1297,6 +1308,30 @@ BOOTRAPING TEST AND TEST SUITE
<target name="test.done" depends="test.suite, test.stability"/>
+ <target name="optimised.test.suite" depends="optimised.done">
+ <taskdef resource="scala/tools/partest/antlib.xml" classpathref="optimised.classpath"/>
+ <partest showlog="yes" erroronfailed="yes" javacmd="${java.home}/bin/java"
+ timeout="1200000" javaccmd="${javac.cmd}">
+ <classpath>
+ <path refid="optimised.classpath"/>
+ <fileset dir="${test.dir}/files/lib" includes="*.jar"/>
+ </classpath>
+ <postests dir="${test.dir}/files/pos" includes="*.scala"/>
+ <pos5tests dir="${test.dir}/files/pos5" includes="*.scala"/>
+ <negtests dir="${test.dir}/files/neg" includes="*.scala"/>
+ <runtests dir="${test.dir}/files">
+ <include name="run/**/*.scala"/>
+ <include name="jvm/**/*.scala"/>
+ <include name="jvm5/**/*.scala"/>
+ </runtests>
+ <residenttests dir="${test.dir}/files/res" includes="*.res"/>
+ <!-- <scripttests dir="${test.dir}/files/script" includes="*.scala"/> -->
+ </partest>
+ </target>
+
+
+ <target name="optimised.test.done" depends="optimised.test.suite"/>
+
<!-- ===========================================================================
DISTRIBUTION
============================================================================ -->