From a8187bfcc52f587c6881bfb19cb68ba68dbc40a9 Mon Sep 17 00:00:00 2001
From: david_williams <david_williams>
Date: Mon, 11 Dec 2006 02:37:50 +0000
Subject: [PATCH] attempt to loosen complete build failures
---
.../distribution/wtp.tests/build.xml | 103 +++++++++++-------
1 file changed, 62 insertions(+), 41 deletions(-)
diff --git a/releng.wtpbuilder/distribution/wtp.tests/build.xml b/releng.wtpbuilder/distribution/wtp.tests/build.xml
index 5f6914ef7..1ffae50f5 100644
--- a/releng.wtpbuilder/distribution/wtp.tests/build.xml
+++ b/releng.wtpbuilder/distribution/wtp.tests/build.xml
@@ -38,8 +38,7 @@
<fileset dir="${test.component.dir}/testScripts"></fileset>
</copy>
- <echo
- message="BASEOS: ${env.BASEOS} BASEWS: ${env.BASEWS} BASEARCH: ${env.BASEARCH} " />
+ <echo message="BASEOS: ${env.BASEOS} BASEWS: ${env.BASEWS} BASEARCH: ${env.BASEARCH} " />
<ant
antfile="${test.component.dir}/testdependency.xml"
@@ -69,48 +68,70 @@
<target name="unzipTests">
- <unzip
- dest="${testRoot}"
- src="${buildDirectory}/${buildLabel}/wtp-sdk-${buildLabel}.zip"
- overwrite="true" />
- <unzip
- dest="${testRoot}"
- src="${buildDirectory}/${buildLabel}/wtp-wst-Automated-Tests-${buildLabel}.zip"
- overwrite="true" />
- <unzip
- dest="${testRoot}"
- src="${buildDirectory}/${buildLabel}/wtp-jst-Automated-Tests-${buildLabel}.zip"
- overwrite="true" />
-
- <unzip
- dest="${testRoot}"
- src="${buildDirectory}/${buildLabel}/wtp-jsf-sdk-${buildLabel}.zip"
- overwrite="true" />
- <unzip
- dest="${testRoot}"
- src="${buildDirectory}/${buildLabel}/wtp-jsf-Automated-Tests-${buildLabel}.zip"
- overwrite="true" />
-
- <unzip
- dest="${testRoot}"
- src="${buildDirectory}/${buildLabel}/wtp-jpa-sdk-${buildLabel}.zip"
- overwrite="true" />
- <unzip
- dest="${testRoot}"
- src="${buildDirectory}/${buildLabel}/wtp-jpa-Automated-Tests-${buildLabel}.zip"
- overwrite="true" />
+ <!--unzip the builds and junit tests -->
+ <exec
+ dir="${buildDirectory}/${buildLabel}"
+ executable="unzip"
+ failonerror="false">
+ <arg line="-o -qq wtp-sdk-${buildLabel}.zip -d ${testRoot}" />
+ </exec>
+
+ <exec
+ dir="${buildDirectory}/${buildLabel}"
+ executable="unzip"
+ failonerror="false">
+ <arg line="-o -qq wtp-wst-Automated-Tests-${buildLabel}.zip -d ${testRoot}" />
+ </exec>
+ <exec
+ dir="${buildDirectory}/${buildLabel}"
+ executable="unzip"
+ failonerror="false">
+ <arg line="-o -qq wtp-jst-Automated-Tests-${buildLabel}.zip -d ${testRoot}" />
+ </exec>
+
+
+ <exec
+ dir="${buildDirectory}/${buildLabel}"
+ executable="unzip"
+ failonerror="false">
+ <arg line="-o -qq wtp-jsf-sdk-${buildLabel}.zip -d ${testRoot}" />
+ </exec>
+ <exec
+ dir="${buildDirectory}/${buildLabel}"
+ executable="unzip"
+ failonerror="false">
+ <arg line="-o -qq wtp-jsf-Automated-Tests-${buildLabel}.zip -d ${testRoot}" />
+ </exec>
+
+
+ <exec
+ dir="${buildDirectory}/${buildLabel}"
+ executable="unzip"
+ failonerror="false">
+ <arg line="-o -qq wtp-jpa-sdk-${buildLabel}.zip -d ${testRoot}" />
+ </exec>
+ <exec
+ dir="${buildDirectory}/${buildLabel}"
+ executable="unzip"
+ failonerror="false">
+ <arg line="-o -qq wtp-jpa-Automated-Tests-${buildLabel}.zip -d ${testRoot}" />
+ </exec>
</target>
-<!-- time out may need to be set/adjust for api or performance tests?
- some common values:
- 7200000: 2 hours
- 3600000: 1 hour
- 1800000: 30 minutes
--->
- <property name="testTimeLimit" value="1800000" />
- <property name="testFailOnError" value="false" />
-
+ <!-- time out may need to be set/adjust for api or performance tests?
+ some common values:
+ 7200000: 2 hours
+ 3600000: 1 hour
+ 1800000: 30 minutes
+ -->
+ <property
+ name="testTimeLimit"
+ value="1800000" />
+ <property
+ name="testFailOnError"
+ value="false" />
+
<target name="runTestEclipse">
<java
taskname="test-wtp-${testTarget}"
--
GitLab