From 24d3d37aef0af4787c41f1d0dcf3e68587f1f77e Mon Sep 17 00:00:00 2001
From: david_williams <david_williams>
Date: Sat, 20 Sep 2008 03:08:49 +0000
Subject: [PATCH] 248038 We should move to Java 6 to run JUnit tests
---
releng.wtpbuilder/distribution/xsl.tests/build.xml | 4 ++--
.../distribution/xsl.tests/testScripts/wtp-junit-tests.xml | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/releng.wtpbuilder/distribution/xsl.tests/build.xml b/releng.wtpbuilder/distribution/xsl.tests/build.xml
index d66973022..426b03b28 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 7c94b4959..2e41a2bc5 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
--
GitLab