summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorLeif Åstrand <leif@vaadin.com>2011-10-17 13:01:58 +0000
committerLeif Åstrand <leif@vaadin.com>2011-10-17 13:01:58 +0000
commit7c06bfa1605de089f30b7d622bf8c9ed2e0d34ae (patch)
treefded340ffbeb7d17bc60a5e906946232c14f1058 /build
parent06c008c2fba30a5165147686c9e677e4a69f9987 (diff)
downloadvaadin-framework-7c06bfa1605de089f30b7d622bf8c9ed2e0d34ae.tar.gz
vaadin-framework-7c06bfa1605de089f30b7d622bf8c9ed2e0d34ae.zip
Moved the integration test sleep so that it isn't in effect if only running the integration tests
svn changeset:21718/svn branch:6.7
Diffstat (limited to 'build')
-rw-r--r--build/build.xml9
1 files changed, 5 insertions, 4 deletions
diff --git a/build/build.xml b/build/build.xml
index 5999381f87..0b2481ae81 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -883,7 +883,11 @@
<target name="tests" depends="compile-java, internal-package-war">
<!-- Run all different types of tests in parallel to decrease testing time -->
<parallel threadcount="3">
- <antcall inheritrefs="true" inheritall="true" target="integration-tests"></antcall>
+ <sequential>
+ <!-- Sleep before running integration tests so testbench tests have time to compile and start -->
+ <sleep minutes="4" />
+ <antcall inheritrefs="true" inheritall="true" target="integration-tests"></antcall>
+ </sequential>
<antcall inheritrefs="true" inheritall="true" target="testbench-tests"></antcall>
<antcall inheritrefs="true" inheritall="true" target="server-side-tests"></antcall>
</parallel>
@@ -954,9 +958,6 @@
<!-- Empty passphrase if no passphrase defined -->
<property name="passphrase" value="" />
<property name="tests.war" location="${result-path}/${test-war-filename}" />
-
- <!-- Sleep before running integration tests so testbench tests have time to compile and start -->
- <sleep minutes="4" />
<!-- Run the separate test script. -->
<ant antfile="tests/integration_tests.xml" target="integration-test-all" inheritall="false" inheritrefs="true">