post M5 test framework changes
diff --git a/releng.wtpbuilder/distribution/wtp.tests/build.xml b/releng.wtpbuilder/distribution/wtp.tests/build.xml
index 4545580..2e7ca57 100644
--- a/releng.wtpbuilder/distribution/wtp.tests/build.xml
+++ b/releng.wtpbuilder/distribution/wtp.tests/build.xml
@@ -28,9 +28,9 @@
<mkdir dir="${testRoot}" />
<!-- if results already exist, delete them -->
- <delete dir="${testRoot}/results" failOnError="false"/>
+ <delete dir="${testRoot}/results" failOnError="false" />
<mkdir dir="${testRoot}/results" />
-
+
<mkdir dir="${testRoot}/results/consolelogs" />
<mkdir dir="${testRoot}/results/consolelogs/metadata-logs" />
<mkdir dir="${testRoot}/results/consolelogs/configuration-logs" />
@@ -108,16 +108,16 @@
</target>
<!-- time out may need to be set/adjust for api or performance tests?
- This testTimeLimit is the whole, overall limit on tests. There's a shorter
- one for individual suites.
-
+ This testTimeLimit is the whole, overall limit on tests. There's a shorter
+ one for individual suites.
+
some common values, of milliseconds to more recognizable units:
7200000: 2 hours
3600000: 1 hour
1800000: 30 minutes
600000: 10 minutes
-->
-
+
<property name="testTimeLimit" value="7200000" />
<property name="testFailOnError" value="false" />
@@ -127,43 +127,46 @@
<property name="vmargs"
- value="-Xms256m -Xmx512m -Dosgi.ws=${env.BASEWS} -Dosgi.os=${env.BASEOS} -Dosgi.arch=${env.BASEARCH} -Dws=${env.BASEWS} -Dos=${env.BASEOS} -Darch=${env.BASEARCH} -Dosgi.clean=true -Dnoclean=true -DbuildBranch=${buildBranch} -DbuildType=${buildType} -DbuildId=${buildId}" />
+ value="-Xms256m -Xmx512m -Dosgi.ws=${env.BASEWS} -Dosgi.os=${env.BASEOS} -Dosgi.arch=${env.BASEARCH} -Dws=${env.BASEWS} -Dos=${env.BASEOS} -Darch=${env.BASEARCH} -Dosgi.clean=true -Dnoclean=true -DbuildBranch=${buildBranch} -DbuildType=${buildType} -DbuildId=${buildId} -DPLUGIN_PATH=${plugin-path} -DtestRoot=${testRoot} -DtestDir=${testRoot} -DbuildDirectory=${buildDirectory} -Dbuild.home=${env.BUILD_HOME} -Dperf.buildId=${buildType}${date}-${time} -DeclipseBuilderDirectory=${pde.builder.path} -DbuildLabel=${buildLabel}" />
+
+ <!-- -DtestRoot=${testRoot} -DtestDir=${testRoot} -DbuildDirectory=${buildDirectory} -Dbuild.home=${env.BUILD_HOME} -Dperf.buildId=${buildType}${date}-${time} -DeclipseBuilderDirectory=${pde.builder.path} -DbuildLabel=${buildLabel} -->
<property name="test-vm" value="${env.JAVA_5_HOME}/bin/java" />
- <!--ensure executable has execute permission-->
- <chmod file="${testRoot}/eclipse/eclipse" perm="ugo+rx" />
-
<echo message="Running junits" />
- <exec executable="${testRoot}/eclipse/eclipse"
- dir="${testRoot}/eclipse" timeout="${testTimeLimit}">
- <arg line="-nosplash" />
- <arg line="-suppressErrors" />
- <arg line="-debug" />
- <arg line="-consoleLog" />
- <arg line="-data ./antRunnerWorkspace" />
- <arg line="-vm ${test-vm}" />
+ <java taskname="unit-test-${classname}" fork="true"
+ resultProperty="wtpjunitresult-${classname}" failonerror="false"
+ timeout="${testTimeLimit}" dir="${testRoot}/eclipse"
+ jvm="${env.JAVA_5_HOME}/bin/java"
+ classname="org.eclipse.equinox.launcher.Main">
+ <classpath>
+ <fileset dir="${testRoot}/eclipse/plugins">
+ <include name="org.eclipse.equinox.launcher_*.jar" />
+ </fileset>
+ </classpath>
+
+ <arg line="./antRunnerWorkspace" />
+ <arg line="${test-vm}" />
<arg line="-application org.eclipse.ant.core.antRunner" />
+ <arg line="formatter=${formatter},${test-output}" />
<arg
line="-propertyfile ${test.component.dir}/testScripts/testServer.properties" />
<arg line="-logger org.apache.tools.ant.DefaultLogger" />
<arg
line="-file ${test.component.dir}/testScripts/test.xml all" />
- <arg line="-DtestRoot=${testRoot}" />
- <arg line="-DtestDir=${testRoot}" />
- <arg line="-DbuildDirectory=${buildDirectory}" />
- <arg line="-Dbuild.home=${env.BUILD_HOME}" />
- <arg line="-Dperf.buildId=${buildType}${date}-${time}" />
- <arg line="-DeclipseBuilderDirectory=${pde.builder.path}" />
- <arg line="-DbuildLabel=${buildLabel}" />
- <arg line="-vmargs ${vmargs}" />
- <env key="DISPLAY" value="${env.DISPLAY}" />
- <redirector output="${testRoot}/results/fullOutput.txt"
- error="${testRoot}/results/fullErrorLog.txt" />
+ <arg line="-nosplash" />
+ <arg line="-suppressErrors" />
+ <arg line="-debug" />
+ <arg line="-consoleLog" />
+ <arg
+ <arg line="-vmargs ${vmargs}" />
+ <env key="DISPLAY" value="${env.DISPLAY}" />
+ <redirector output="${testRoot}/results/fullOutput.txt"
+ error="${testRoot}/results/fullErrorLog.txt" alwayslog="true" />
+ </java>
- </exec>
</target>
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 8a5264c..c500216 100644
--- a/releng.wtpbuilder/distribution/wtp.tests/testScripts/wtp-junit-tests.xml
+++ b/releng.wtpbuilder/distribution/wtp.tests/testScripts/wtp-junit-tests.xml
@@ -98,10 +98,6 @@
</condition>
<property name="test-vm" value="" />
- <!--ensure executable has execute permission-->
- <chmod file="${testRoot}/eclipse/eclipse" perm="ugo+rx" />
-
-
<echo message="Running ${classname}" />
<echo
message="Result file: ${junit-report-output}/${classname}.xml." />