diff --git a/releng.wtpbuilder/distribution/xsl.tests/build.xml b/releng.wtpbuilder/distribution/xsl.tests/build.xml index d66973022376d404405882f1aa00c4da4106abf6..426b03b28d4f6a93290461ecc7b053f7d341054b 100644 --- a/releng.wtpbuilder/distribution/xsl.tests/build.xml +++ b/releng.wtpbuilder/distribution/xsl.tests/build.xml @@ -146,7 +146,7 @@ description="Run our JUnit's within an instance of antRunner"> <property name="test-vm" - value="${env.JAVA_5_HOME}/bin/java" /> + value="${env.JAVA_6_HOME}/bin/java" /> <property name="plugin-path" value="${testRoot}${dropinsFolder}/eclipse/plugins" /> @@ -175,7 +175,7 @@ failonerror="false" timeout="${testTimeLimit}" dir="${testRoot}/eclipse" - jvm="${env.JAVA_5_HOME}/bin/java" + jvm="${env.JAVA_6_HOME}/bin/java" classname="org.eclipse.equinox.launcher.Main"> <classpath> <fileset diff --git a/releng.wtpbuilder/distribution/xsl.tests/testScripts/wtp-junit-tests.xml b/releng.wtpbuilder/distribution/xsl.tests/testScripts/wtp-junit-tests.xml index 7c94b49591454ad06e638421ee864739eababa18..2e41a2bc597087fdaa8b8f1b377a637f393f0581 100644 --- a/releng.wtpbuilder/distribution/xsl.tests/testScripts/wtp-junit-tests.xml +++ b/releng.wtpbuilder/distribution/xsl.tests/testScripts/wtp-junit-tests.xml @@ -61,7 +61,7 @@ value="${junit-report-output}/raw/${classname}.xml" /> <property name="jvm" - value="${env.JAVA_5_HOME}/bin/java" /> + value="${env.JAVA_6_HOME}/bin/java" /> <dirname file="${ant.file}" property="currentDir" /> @@ -109,7 +109,7 @@ message="buildLabel: ${buildLabel}" /> <echo level="debug" - message="jvm: ${env.JAVA_5_HOME}/bin/java" /> + message="jvm: ${jvm}" /> </target> <target name="core-test" @@ -177,7 +177,7 @@ failonerror="false" timeout="${timeout}" dir="${testRoot}/eclipse" - jvm="${env.JAVA_5_HOME}/bin/java" + jvm="${jvm}" classname="org.eclipse.equinox.launcher.Main"> <classpath> <fileset