diff options
| author | Artur Signell <artur@vaadin.com> | 2012-09-05 21:13:17 +0300 |
|---|---|---|
| committer | Artur Signell <artur@vaadin.com> | 2012-09-09 11:23:34 +0300 |
| commit | f871b85e3175177461ac5d06a68734f5ec7b94a2 (patch) | |
| tree | 6e37b01e61c86476735845e263f587c3ca1e76f5 /build.xml | |
| parent | 5a3f76374cff1ea9e1eacf3d36a5796878dc7904 (diff) | |
| download | vaadin-framework-f871b85e3175177461ac5d06a68734f5ec7b94a2.tar.gz vaadin-framework-f871b85e3175177461ac5d06a68734f5ec7b94a2.zip | |
Run server integration tests with other tests (#9299)
Diffstat (limited to 'build.xml')
| -rw-r--r-- | build.xml | 7 |
1 files changed, 5 insertions, 2 deletions
@@ -34,15 +34,18 @@ </target> <target name="tests" depends="buildorder"> + <property name="war.file" location="result/artifacts/${vaadin.version}/vaadin-uitest/vaadin-uitest-${vaadin.version}.war" /> <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"/> + <ant antfile="uitest/integration_tests.xml" target="integration-test-all" inheritall="false" inheritrefs="false"> + <property name="demo.war" value="${war.file}" /> + </ant> </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" /> + <property name="war.file" location="${war.file}" /> </ant> </parallel> </target> |