fixes for standalone builds
diff --git a/releng.wtpbuilder/distribution/wtp.tests/build.xml b/releng.wtpbuilder/distribution/wtp.tests/build.xml
index 7fbc499..59f5e41 100644
--- a/releng.wtpbuilder/distribution/wtp.tests/build.xml
+++ b/releng.wtpbuilder/distribution/wtp.tests/build.xml
@@ -10,7 +10,10 @@
-->
<property
environment="env"/>
- <!-- required to get proper value of dropinsFolder -->
+ <fail
+ message="testRoot must be set for this task"
+ unless="testRoot"/>
+ <!-- required to get proper value of dropinsFolder -->
<property
name="keyCfgFile"
value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg"/>
@@ -19,9 +22,19 @@
message="keyCfgFile: ${keyCfgFile}"/>
<property
file="${keyCfgFile}"/>
- <fail
- message="testRoot must be set for this task"
- unless="testRoot"/>
+
+ <!-- if not otherwise set, assume 'all' tests -->
+ <property
+ name="testTarget"
+ value="all"/>
+ <!--
+ typcially already set, but in case of standalone tests, may not
+ be
+ -->
+ <property
+ name="buildLabel"
+ value="${buildType}-${buildId}-${timestamp}"/>
+
<!--
Steps to do after the build is done.
@@ -91,15 +104,9 @@
target="unzipTests"/>
<antcall
target="runTestEclipse">
- <param
- name="testTarget"
- value="all"/>
</antcall>
<antcall
target="postRunTestEclipse">
- <param
- name="testTarget"
- value="all"/>
</antcall>
</target>
<target
@@ -149,12 +156,9 @@
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. some common values, of
- milliseconds to more recognizable units:
- 14400000: 4 hours
- 7200000: 2 hours
- 3600000: 1 hour
- 1800000: 30 minutes
- 600000: 10 minutes
+ milliseconds to more recognizable units: 14400000: 4 hours
+ 7200000: 2 hours 3600000: 1 hour 1800000: 30 minutes 600000: 10
+ minutes
-->
<property
name="testTimeLimit"
@@ -182,6 +186,10 @@
name="eclipse.home"
value="${testRoot}"/>
<echo
+ message="testTarget: ${testTarget}"/>
+ <echo
+ message="plugin-path: ${plugin-path}"/>
+ <echo
message="Running junits"/>
<!--
If there is not exactly one launcher in the stack, we'd best
@@ -203,8 +211,6 @@
produces ant debug info to be output ... which is a TON of
stuff
-->
- <echo
- message="eclipse.launcher: ${eclipse.launcher}"/>
<java
taskname="unit-test-masterprocess"
fork="true"
@@ -247,9 +253,7 @@
value="-Dprojectname=${projectname}"/>
<jvmarg
value="-Djava.io.tmpdir=${env.RECOMMENDED_TMP_DIR}"/>
- <arg
- value="--launcher.suppressErrors"/>
- <arg
+ <arg
value="-nosplash"/>
<arg
value="-consolelog"/>
@@ -262,46 +266,45 @@
<arg
value="org.eclipse.ant.core.antRunner"/>
<arg
- value="-file"/>
- <arg
- value="${testRoot}/test.xml"/>
+ value="-verbose"/>
<arg
value="-logger"/>
<arg
value="org.apache.tools.ant.DefaultLogger"/>
+ <arg
+ value="-file"/>
+ <arg
+ value="${testRoot}/test.xml"/>
+ <arg
+ value="${testTarget}"/>
+
+ <!-- make sure our forked env has a DISPLAY -->
<env
key="DISPLAY"
value="${env.DISPLAY}"/>
<redirector
output="${testRoot}/results/fullOutput.txt"
error="${testRoot}/results/fullErrorLog.txt"/>
- <sysproperty
- key="build.home"
- value="${env.BUILD_HOME}"/>
- <sysproperty
- key="buildDirectory"
- value="${buildDirectory}"/>
- <sysproperty
- key="buildLabel"
- value="${buildLabel}"/>
- <sysproperty
- key="baseLocation"
- value="${baseLocation}"/>
- <sysproperty
- key="testRoot"
- value="${testRoot}"/>
- <sysproperty
- key="testDir"
- value="${testRoot}"/>
- <sysproperty
- key="perf.buildId"
- value="${buildType}${date}-${time}"/>
- <sysproperty
- key="eclipseBuilderDirectory"
- value="${pde.builder.path}"/>
- <sysproperty
- key="buildLabel"
- value="${buildLabel}"/>
+ <jvmarg
+ value="-Dbuild.home=${env.BUILD_HOME}"/>
+ <jvmarg
+ value="-DbuildDirectory=${buildDirectory}"/>
+ <jvmarg
+ value="-DbuildLabel=${buildLabel}"/>
+ <jvmarg
+ value="-DbaseLocation=${baseLocation}"/>
+ <jvmarg
+ value="-DtestRoot=${testRoot}"/>
+ <jvmarg
+ value="-DtestDir=${testRoot}"/>
+ <jvmarg
+ value="-Dperf.buildId=${buildType}${date}-${time}"/>
+ <jvmarg
+ value="-DeclipseBuilderDirectory=${pde.builder.path}"/>
+ <jvmarg
+ value="-DbuildLabel=${buildLabel}"/>
+ <jvmarg
+ value="-Dplugin-path=${plugin-path}"/>
</java>
<echo
message="wtpmasterjunitresult ${wtpmasterjunitresult}"/>