diff options
| author | Sauli Tähkäpää <sauli@vaadin.com> | 2014-03-03 08:40:54 +0200 |
|---|---|---|
| committer | Vaadin Code Review <review@vaadin.com> | 2014-03-03 13:58:37 +0000 |
| commit | f6bd40d2eb63b092ec5be4c477b6e1bfee3021cc (patch) | |
| tree | 0d1914e9a7cf519e1537a4e92bc28953fa8724f9 /build.xml | |
| parent | 06d0cf4daa414eca3c2a73df8171706ca7012213 (diff) | |
| download | vaadin-framework-f6bd40d2eb63b092ec5be4c477b6e1bfee3021cc.tar.gz vaadin-framework-f6bd40d2eb63b092ec5be4c477b6e1bfee3021cc.zip | |
Extracted integration-test target.
Change-Id: I08722f298d295365c48e00ee04d40541b3a71de8
Diffstat (limited to 'build.xml')
| -rw-r--r-- | build.xml | 14 |
1 files changed, 9 insertions, 5 deletions
@@ -46,19 +46,23 @@ </target> <target name="test-all" depends="buildorder"> - <property name="war.file" location="result/artifacts/${vaadin.version}/vaadin-uitest/vaadin-uitest-${vaadin.version}.war" /> - <parallel> <!-- JUnit tests, can be run without a server --> <subant buildpathref="build-path" target="test" /> <!-- Server deployment + TestBench tests --> - <ant antfile="uitest/build.xml" target="test-testbench"> - <property name="war.file" location="${war.file}" /> - </ant> + <antcall target="integration-test" /> </parallel> </target> + <target name="integration-test" depends="buildorder"> + <property name="war.file" location="result/artifacts/${vaadin.version}/vaadin-uitest/vaadin-uitest-${vaadin.version}.war" /> + + <ant antfile="uitest/build.xml" target="test-testbench"> + <property name="war.file" location="${war.file}" /> + </ant> + </target> + <target name="official.build.checks" if="build.release"> <condition property="java.version.matches"> <equals arg1="${ant.java.version}" arg2="${vaadin.java.version}" /> |