summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArtur Signell <artur@vaadin.com>2012-09-05 19:49:04 +0300
committerArtur Signell <artur@vaadin.com>2012-09-09 11:23:31 +0300
commit204c5233ed041cf74343644eddf11ccab65324af (patch)
tree95acd39b7b5cba47d2b3c319baa377018dd7f5be
parent98d9d6fafc612f44d62d025520d040c69f5e80bc (diff)
downloadvaadin-framework-204c5233ed041cf74343644eddf11ccab65324af.tar.gz
vaadin-framework-204c5233ed041cf74343644eddf11ccab65324af.zip
Run integration tests too (#9299)
-rw-r--r--build.xml5
1 files changed, 5 insertions, 0 deletions
diff --git a/build.xml b/build.xml
index dd5741c523..05d3888b8c 100644
--- a/build.xml
+++ b/build.xml
@@ -35,6 +35,11 @@
<target name="tests" depends="buildorder">
<parallel>
+ <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"/>
+ </sequential>
<subant buildpathref="build-path" target="tests" />
<ant antfile="uitest/test.xml" target="test-package">
<property name="war.file" location="result/artifacts/${vaadin.version}/vaadin-uitest/vaadin-uitest-${vaadin.version}.war" />