diff options
| author | Patrik Lindström <patrik@vaadin.com> | 2013-10-11 14:23:52 +0300 |
|---|---|---|
| committer | Patrik Lindström <patrik@vaadin.com> | 2013-10-11 14:27:29 +0300 |
| commit | df9a1192efeb49285cb1c4fc100bb60b5a77ac14 (patch) | |
| tree | a89aea53ffd89943f8672a5ef8943da6579bdb92 /build.xml | |
| parent | c2b81b20ca3a981b775ac5f16506861724119df4 (diff) | |
| parent | 4cb304d8eb63ce0045a2742bd9c945af4f12aa66 (diff) | |
| download | vaadin-framework-df9a1192efeb49285cb1c4fc100bb60b5a77ac14.tar.gz vaadin-framework-df9a1192efeb49285cb1c4fc100bb60b5a77ac14.zip | |
Merge remote-tracking branch 'origin/7.1' into testbench4
Change-Id: I58fe3b4126b61ec342ee06c18ce49a7fa7d4fd3d
Diffstat (limited to 'build.xml')
| -rw-r--r-- | build.xml | 15 |
1 files changed, 6 insertions, 9 deletions
@@ -43,19 +43,16 @@ <target name="test" depends="buildorder"> <subant buildpathref="build-path" target="test" /> </target> + <target name="test-all" 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" /> - <ant antfile="uitest/integration_tests.xml" target="integration-test-all" inheritall="false" inheritrefs="false"> - <property name="demo.war" value="${war.file}" /> - </ant> - </sequential> + <!-- JUnit tests, can be run without a server --> <subant buildpathref="build-path" target="test" /> - <ant antfile="uitest/test.xml" target="test-package"> + + <!-- Server deployment + TestBench tests --> + <ant antfile="uitest/build.xml" target="test-testbench"> <property name="war.file" location="${war.file}" /> </ant> </parallel> |