From dd69f3789cc069f84d6e048df0618b6dd1e8286f Mon Sep 17 00:00:00 2001
From: david_williams <david_williams>
Date: Mon, 11 Aug 2008 07:07:33 +0000
Subject: [PATCH] adjust timeouts to temporarily allow extra long test suites
---
.../wtp.tests/testScripts/wtp-junit-tests.xml | 13 +++++++++++--
releng.wtpbuilder/scripts/build/buildutilities.xml | 4 ++--
2 files changed, 13 insertions(+), 4 deletions(-)
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 ee2a21da8..8eccce38c 100644
--- a/releng.wtpbuilder/distribution/wtp.tests/testScripts/wtp-junit-tests.xml
+++ b/releng.wtpbuilder/distribution/wtp.tests/testScripts/wtp-junit-tests.xml
@@ -46,11 +46,20 @@
<property
name="testRoot"
value="${testRoot}"/>
- <!-- temporarily changed from 30 minutes (1800000) to 2 hrs (7200000)
+ <!-- temporarily changed from 30 minutes to 1 hrs
to help spot problematic tests -->
+ <!--
+ Some common values, of milliseconds to more recognizable units:
+ 14400000: 4 hours
+ 7200000: 2 hours
+ 3600000: 1 hour
+ 1800000: 30 minutes
+ 600000: 10 minutes
+ -->
+
<property
name="timeout"
- value="7200000"/>
+ value="3600000"/>
<property
name="junit-report-output"
value="${junit-report-output}"/>
diff --git a/releng.wtpbuilder/scripts/build/buildutilities.xml b/releng.wtpbuilder/scripts/build/buildutilities.xml
index 138340bc6..b31381702 100644
--- a/releng.wtpbuilder/scripts/build/buildutilities.xml
+++ b/releng.wtpbuilder/scripts/build/buildutilities.xml
@@ -27,7 +27,7 @@
<!-- if not otherwise set, use these default properties -->
<property
name="debugOptimization"
- value="true" />
+ value="false" />
<!-- we should always normalize ("-repack") jars. For ones which are not supposed
to be normalized, such as pre-existing jars, they need to be added to the pack.properties file
@@ -350,7 +350,7 @@
<target
name="makeBackupCopyForDebugging"
if="keepIfDebug">
- <!-- temporary copy while confirming build to be able to do side-by-side comparisons -->
+ <!-- temporary copy while confirming build to be able to do side-by-side comparisons -->
<mkdir
dir="${buildDirectory}/backuporiginalzips" />
<copy
--
GitLab