changes for post M5 test framework
diff --git a/releng.wtpbuilder/distribution/wtp.tests/build.xml b/releng.wtpbuilder/distribution/wtp.tests/build.xml
index e30e12c..071e63f 100644
--- a/releng.wtpbuilder/distribution/wtp.tests/build.xml
+++ b/releng.wtpbuilder/distribution/wtp.tests/build.xml
@@ -145,7 +145,7 @@
failonerror="${testFailOnError}"
timeout="${testTimeLimit}"
output="${testRoot}/results/consolelogs/wtptestlog.txt"
- dir="${testRoot}"
+ dir="${testRoot}/eclipse"
jvm="${env.JAVA_5_HOME}/bin/java"
classname="org.eclipse.core.launcher.Main" >
@@ -185,7 +185,7 @@
value="${buildDirectory}" />
<sysproperty
key="baseLocation"
- value="${baseLocation}" />
+ value="${testRoot}/eclipse" />
<sysproperty
key="testDir"
value="${testRoot}" />
diff --git a/releng.wtpbuilder/distribution/wtp.tests/testScripts/junit-tests.xml b/releng.wtpbuilder/distribution/wtp.tests/testScripts/junit-tests.xml
index c71c00a..cdabf63 100644
--- a/releng.wtpbuilder/distribution/wtp.tests/testScripts/junit-tests.xml
+++ b/releng.wtpbuilder/distribution/wtp.tests/testScripts/junit-tests.xml
@@ -20,9 +20,13 @@
<echo message="test-type: core-test" />
<echo message="basedir: ${basedir}" />
- <echo message="basedir: ${basedir}" />
+ <echo message="eclipse-home: ${eclipse-home}" />
+ <echo message="class-name: ${classname}" />
+ <echo message="plugin-name: ${plugin-name}" />
+ <echo message="plugin-direcotory: ${testPlugin}" />
<echo message="library-xml-file: ${library-xml-file}" />
<echo message="junit-report-output: ${junit-report-output}" />
+ <echo message="jvm: ${env.JAVA_5_HOME}" />
<!-- if not otherwise set, be sure extraVMargs is at least empty string -->
<property name="extraVMargs" value="" />
@@ -38,12 +42,14 @@
<property name="junit-report-output"
value="${junit-report-output}" />
<property name="plugin-path"
- value="${basedir}/plugins/${plugin-name}" />
+ value="${basedir}/plugins/${testPlugin}" />
<property name="formatter"
value="org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter" />
<property name="test-output"
value="${eclipse-home}/${classname}.xml" />
<property name="useEclispeExe" value="true" />
+ <property name="classname" value="${classname}" />
+ <property name="jvm" value="${env.JAVA_5_HOME}" />
</ant>
</target>
@@ -52,9 +58,13 @@
<echo message="test-type: ui-test" />
<echo message="basedir: ${basedir}" />
- <echo message="eclipse.home: ${eclipse.home}" />
+ <echo message="eclipse-home: ${eclipse-home}" />
+ <echo message="class-name: ${classname}" />
+ <echo message="plugin-name: ${plugin-name}" />
+ <echo message="plugin-direcotory: ${testPlugin}" />
<echo message="library-xml-file: ${library-xml-file}" />
<echo message="junit-report-output: ${junit-report-output}" />
+ <echo message="jvm: ${env.JAVA_5_HOME}" />
<!-- if not otherwise set, be sure extraVMargs is at least empty string -->
<property name="extraVMargs" value="" />
<mkdir dir="${junit-report-output}" />
@@ -69,12 +79,14 @@
<property name="junit-report-output"
value="${junit-report-output}" />
<property name="plugin-path"
- value="${basedir}/plugins/${plugin-name}" />
+ value="${basedir}/plugins/${testPlugin}" />
<property name="formatter"
value="org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter" />
<property name="test-output"
value="${eclipse-home}/${classname}.xml" />
<property name="useEclispeExe" value="true" />
+ <property name="classname" value="${classname}" />
+ <property name="jvm" value="${env.JAVA_HOME}" />
</ant>
</target>