Allow skipping TB2/TB3 tests using tests.tb2/tb3.skip

Change-Id: If9f16657731fa5ea06e61bf9702abe385e4fc7a1

diff --git a/uitest/tb3test.xml b/uitest/tb3test.xml
index de69e0ebe6342e407253e458c480fbe64a66caa4..5285280608fc6075679828ce430ac20c289e6029 100644 (file)
--- a/uitest/tb3test.xml
+++ b/uitest/tb3test.xml
@@ -10,7 +10,7 @@
         <path location="${tb3test.dir}/result/classes" />
     </path>
 
-    <target name="run-all-tb3-tests" description="Run all the TB3 tests (except server tests) in the project">
+    <target name="run-all-tb3-tests" unless="tests.tb3.skip" description="Run all the TB3 tests (except server tests) in the project">
         <antcall target="run-tb3-suite">
             <param name="junit.test.suite" value="com.vaadin.tests.tb3.AllTB3Tests" />
         </antcall>

diff --git a/uitest/test.xml b/uitest/test.xml
index c534d676b9b46fbb42f989d73db8377d716f5245..326117fb8f9c4c008c11b056c5bbbe7e9794fc05 100644 (file)
--- a/uitest/test.xml
+++ b/uitest/test.xml
@@ -83,7 +83,7 @@
         <fail unless="com.vaadin.testbench.deployment.url" message="The 'com.vaadin.testbench.deployment.url' property must be defined." />
     </target>
 
-    <target name="run-tb2-tests" depends="check-parameters,compile-tests">
+    <target name="run-tb2-tests" depends="check-parameters,compile-tests" unless="tests.tb2.skip">
         <fileset dir="${test-output-dir}" id="tests-fileset">
             <include name="**/**.java" />
         </fileset>