summaryrefslogtreecommitdiffstats
path: root/tests/integration_base_files
diff options
context:
space:
mode:
authorLeif Åstrand <leif@vaadin.com>2011-10-18 09:17:33 +0000
committerLeif Åstrand <leif@vaadin.com>2011-10-18 09:17:33 +0000
commit402407c7b931d738998f987bb87f71dda10948a7 (patch)
tree37e52a99ce430adf9601476eab35e83243832334 /tests/integration_base_files
parentaf268923b0f39d5ab0ad7390c4fd03a6ea889ea0 (diff)
downloadvaadin-framework-402407c7b931d738998f987bb87f71dda10948a7.tar.gz
vaadin-framework-402407c7b931d738998f987bb87f71dda10948a7.zip
Added some timeouts to avoid build going on forever
Prefix remote output with server name to make it easier to interpret the build logs Generalized the teamcity escaping svn changeset:21730/svn branch:6.7
Diffstat (limited to 'tests/integration_base_files')
-rw-r--r--tests/integration_base_files/base.xml7
1 files changed, 6 insertions, 1 deletions
diff --git a/tests/integration_base_files/base.xml b/tests/integration_base_files/base.xml
index 20fe8b2d8d..5e4ff6d176 100644
--- a/tests/integration_base_files/base.xml
+++ b/tests/integration_base_files/base.xml
@@ -84,7 +84,12 @@
<target name="get-lock">
<mkdir dir="deploy" />
- <exec executable="lockfile">
+ <echo>${server}: Getting the lock</echo>
+ <exec executable="lockfile" failonerror="true">
+ <!-- Check every 10 seconds -->
+ <arg value="-10" />
+ <!-- Retry for 55 minutes (build server gives up after 60 minutes) -->
+ <arg value="-r330" />
<arg value="${lock}" />
</exec>
<echo>${server}: Got the lock</echo>