From f3cfc04d97a744e9a643f24c134e80efaa6e9e9e Mon Sep 17 00:00:00 2001
From: david_williams <david_williams>
Date: Sat, 20 Sep 2008 03:57:43 +0000
Subject: [PATCH] 248038 We should move to Java 6 to run JUnit tests
---
releng.wtpbuilder/distribution/wtp.tests/build.xml | 4 ++--
.../distribution/wtp.tests/testScripts/wtp-junit-tests.xml | 6 +++---
releng.wtpbuilder/distribution/xml.tests/build.xml | 4 ++--
.../distribution/xml.tests/testScripts/wtp-junit-tests.xml | 6 +++---
4 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/releng.wtpbuilder/distribution/wtp.tests/build.xml b/releng.wtpbuilder/distribution/wtp.tests/build.xml
index e7edc792d..530eb6e21 100644
--- a/releng.wtpbuilder/distribution/wtp.tests/build.xml
+++ b/releng.wtpbuilder/distribution/wtp.tests/build.xml
@@ -167,7 +167,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"/>
@@ -212,7 +212,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/wtp.tests/testScripts/wtp-junit-tests.xml b/releng.wtpbuilder/distribution/wtp.tests/testScripts/wtp-junit-tests.xml
index 8eccce38c..86a88f925 100644
--- a/releng.wtpbuilder/distribution/wtp.tests/testScripts/wtp-junit-tests.xml
+++ b/releng.wtpbuilder/distribution/wtp.tests/testScripts/wtp-junit-tests.xml
@@ -74,7 +74,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"/>
@@ -122,7 +122,7 @@
message="buildLabel: ${buildLabel}"/>
<echo
level="debug"
- message="jvm: ${env.JAVA_5_HOME}/bin/java"/>
+ message="jvm: ${jvm}"/>
</target>
<target
name="core-test"
@@ -188,7 +188,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
diff --git a/releng.wtpbuilder/distribution/xml.tests/build.xml b/releng.wtpbuilder/distribution/xml.tests/build.xml
index e7edc792d..530eb6e21 100644
--- a/releng.wtpbuilder/distribution/xml.tests/build.xml
+++ b/releng.wtpbuilder/distribution/xml.tests/build.xml
@@ -167,7 +167,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"/>
@@ -212,7 +212,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/xml.tests/testScripts/wtp-junit-tests.xml b/releng.wtpbuilder/distribution/xml.tests/testScripts/wtp-junit-tests.xml
index 8eccce38c..86a88f925 100644
--- a/releng.wtpbuilder/distribution/xml.tests/testScripts/wtp-junit-tests.xml
+++ b/releng.wtpbuilder/distribution/xml.tests/testScripts/wtp-junit-tests.xml
@@ -74,7 +74,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"/>
@@ -122,7 +122,7 @@
message="buildLabel: ${buildLabel}"/>
<echo
level="debug"
- message="jvm: ${env.JAVA_5_HOME}/bin/java"/>
+ message="jvm: ${jvm}"/>
</target>
<target
name="core-test"
@@ -188,7 +188,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