summaryrefslogtreecommitdiff
path: root/build.xml
diff options
context:
space:
mode:
authorPhilipp Haller <hallerp@gmail.com>2008-10-21 19:04:52 +0000
committerPhilipp Haller <hallerp@gmail.com>2008-10-21 19:04:52 +0000
commitbaa6f58f76e697d98336ce4ef2dbc71c7e0fccc7 (patch)
treec2d612d994191969c889de4b6b42ac3e59d3ff70 /build.xml
parent4c9ef158c68d2add782d81ae490e8e32f2cc1b83 (diff)
downloadscala-baa6f58f76e697d98336ce4ef2dbc71c7e0fccc7.tar.gz
scala-baa6f58f76e697d98336ce4ef2dbc71c7e0fccc7.tar.bz2
scala-baa6f58f76e697d98336ce4ef2dbc71c7e0fccc7.zip
Changed the way in which the path to javac is p...
Changed the way in which the path to javac is passed to partest.
Diffstat (limited to 'build.xml')
-rw-r--r--build.xml4
1 files changed, 3 insertions, 1 deletions
diff --git a/build.xml b/build.xml
index 8dd855096f..9eef99c5f6 100644
--- a/build.xml
+++ b/build.xml
@@ -131,6 +131,8 @@ PROPERTIES
<property name="scalacfork.maxmemory" value="512m"/>
+ <property name="javac.cmd" value="${env.JAVA_HOME}/bin/javac"/>
+
<!-- ===========================================================================
INITIALISATION
============================================================================ -->
@@ -997,7 +999,7 @@ BOOTRAPING TEST AND TEST SUITE
<target name="test.suite" depends="pack.done">
<partest showlog="yes" erroronfailed="yes" javacmd="${java.home}/bin/java"
- timeout="1200000">
+ timeout="1200000" javaccmd="${javac.cmd}">
<classpath>
<path refid="pack.classpath"/>
<fileset dir="${test.dir}/files/lib" includes="*.jar"/>