285383 need a Helios build stream
diff --git a/releng.wtpbuilder/distribution/wtp.tests/build.xml b/releng.wtpbuilder/distribution/wtp.tests/build.xml
index 7413874..1bfa72e 100644
--- a/releng.wtpbuilder/distribution/wtp.tests/build.xml
+++ b/releng.wtpbuilder/distribution/wtp.tests/build.xml
@@ -90,26 +90,26 @@
</copy>
<echo
message="BASEOS: ${env.BASEOS} BASEWS: ${env.BASEWS} BASEARCH: ${env.BASEARCH} "/>
- <ant
- antfile="${test.component.dir}/testdependency.xml"
- target="get">
- <!-- for this distribution, dependencies come from releng.
- assume no subdirectory, if not otherwise set (bug 285383).
+ <!--
+ for this distribution, dependencies come from releng. Assume
+ no subdirectory, if not otherwise set (bug 285383).
-->
- <property name="env.DEP_DIR" value="" />
-
+ <property
+ name="env.DEP_DIR"
+ value=""/>
<property
name="dependency.properties"
value="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties"/>
-
- <available
- file="${dependency.properties}"
- property="dependency.properties.exists"/>
- <fail
- message="dependancy file not found: ${dependency.properties}"
- unless="dependency.properties.exists"/>
-
- <property
+ <available
+ file="${dependency.properties}"
+ property="dependency.properties.exists"/>
+ <fail
+ message="dependancy file not found: ${dependency.properties}"
+ unless="dependency.properties.exists"/>
+ <ant
+ antfile="${test.component.dir}/testdependency.xml"
+ target="get">
+ <property
name="base.install.dir"
value="${testRoot}"/>
</ant>
@@ -169,12 +169,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"
@@ -321,10 +318,10 @@
value="-DbuildLabel=${buildLabel}"/>
<jvmarg
value="-Dplugin-path=${plugin-path}"/>
- <!-- IBM_JAVA_OPTIONS contains JIT work arounds for bug 284441 -->
- <env
- key="IBM_JAVA_OPTIONS"
- value="-Xjit:exclude={org/eclipse/jst/jsp/core/internal/parser/internal/JSPTokenizer.primGetNextToken()Ljava/lang/String;},exclude={org/eclipse/jst/jsp/core/internal/parser/internal/JSPTokenizer.%lt;init%gt;(Ljava/io/Reader;)V},exclude={org/eclipse/wst/html/core/internal/contenttype/HTMLHeadTokenizer.primGetNextToken()Ljava/lang/String;}" />
+ <!-- IBM_JAVA_OPTIONS contains JIT work arounds for bug 284441 -->
+ <env
+ key="IBM_JAVA_OPTIONS"
+ value="-Xjit:exclude={org/eclipse/jst/jsp/core/internal/parser/internal/JSPTokenizer.primGetNextToken()Ljava/lang/String;},exclude={org/eclipse/jst/jsp/core/internal/parser/internal/JSPTokenizer.%lt;init%gt;(Ljava/io/Reader;)V},exclude={org/eclipse/wst/html/core/internal/contenttype/HTMLHeadTokenizer.primGetNextToken()Ljava/lang/String;}"/>
</java>
<echo
message="wtpmasterjunitresult ${wtpmasterjunitresult}"/>