diff options
| author | Build Agent <build@vaadin.com> | 2014-03-04 17:37:17 +0200 |
|---|---|---|
| committer | Build Agent <build@vaadin.com> | 2014-03-04 17:37:18 +0200 |
| commit | 4d3bde51abb9e6a32d774248e3fe8d8ffb8f718e (patch) | |
| tree | 13b3639d7b37b4ba2054a30f2f0a80955c9215c3 | |
| parent | ca18fcb74087b26c27e322541545074fe753a90c (diff) | |
| parent | f6bd40d2eb63b092ec5be4c477b6e1bfee3021cc (diff) | |
| download | vaadin-framework-4d3bde51abb9e6a32d774248e3fe8d8ffb8f718e.tar.gz vaadin-framework-4d3bde51abb9e6a32d774248e3fe8d8ffb8f718e.zip | |
Merge changes from origin/7.1
f6bd40d Extracted integration-test target.
Change-Id: I268c59c4ea45435bdafc0d2dcfd2a657f6bb7443
| -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}" /> |