Extracted integration-test target.

Change-Id: I08722f298d295365c48e00ee04d40541b3a71de8

diff --git a/build.xml b/build.xml
index d2e905b611f3a95b14ca9e316f8b5a8dca302c42..ee24c615297b4b5d22b41f09cfff7519a74f980b 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -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}" />