Add target test-all for UI tests

The target allows running both normal and server integration tests
without cleaning the screenshot directory in between.

Change-Id: Ic0d5db325b831114434a83c7d77be36ac8b20a61

diff --git a/uitest/build.xml b/uitest/build.xml
index ab0c154ba83a515a6326d2928060981cb7b76f6d..6a40f8e539e8f7ed9927ee2ebe7d1a09b3610a2c 100644 (file)
--- a/uitest/build.xml
+++ b/uitest/build.xml
@@ -28,6 +28,31 @@
         <get src="${vaadin.build.repository}/com/vaadin/vaadin-uitest/${vaadin.version}/vaadin-uitest-${vaadin.version}.war" dest="${vaadin.basedir}/uitest/target/vaadin-uitest-${vaadin.version}.war"/>
     </target>
 
+    <!-- run both normal and server tests -->
+    <target name="test-all" depends="clean-testbench-errors">
+        <property name="war.file"
+            location="${vaadin.basedir}/uitest/target/vaadin-uitest-${vaadin.version}.war" />
+        <mkdir dir="${vaadin.basedir}/result" />
+        <parallel>
+            <daemons>
+                <ant antfile="${uitest.dir}/vaadin-server.xml"
+                    inheritall="true" inheritrefs="true" target="deploy-and-start" />
+            </daemons>
+            <sequential>
+                <ant antfile="${uitest.dir}/vaadin-server.xml"
+                    target="wait-for-startup" />
+                <ant antfile="${uitest.dir}/tb3test.xml" target="run-all-tb3-tests"
+                    inheritall="true" />
+                <!-- within sequential for now not to cause problems with result parsing in CI -->
+                <ant antfile="${uitest.dir}/integration_tests.xml"
+                    target="integration-test-all" inheritall="false"
+                    inheritrefs="false">
+                    <property name="demo.war" value="${war.file}" />
+                </ant>
+            </sequential>
+        </parallel>
+    </target>
+
     <target name="test-server" depends="clean-testbench-errors">
         <property name="war.file"
             location="${vaadin.basedir}/uitest/target/vaadin-uitest-${vaadin.version}.war" />