summaryrefslogtreecommitdiffstats
path: root/uitest
diff options
context:
space:
mode:
authorArtur Signell <artur@vaadin.com>2013-10-16 14:48:57 +0300
committerVaadin Code Review <review@vaadin.com>2013-10-16 11:55:08 +0000
commitd41967dffa3a2fda8df98d7973de4a55dbfde31e (patch)
tree733ac935a66662a62afd1c10f652804a0bb88975 /uitest
parentf40159533028f28a1fe967daad4089fb3a35c53b (diff)
downloadvaadin-framework-d41967dffa3a2fda8df98d7973de4a55dbfde31e.tar.gz
vaadin-framework-d41967dffa3a2fda8df98d7973de4a55dbfde31e.zip
Skip compilation of TB2 tests if tests.tb2.skip is set
Change-Id: I647fb48059372b497c77580d252c9622d259d3eb
Diffstat (limited to 'uitest')
-rw-r--r--uitest/test.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/uitest/test.xml b/uitest/test.xml
index 326117fb8f..3bfeb66c05 100644
--- 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" unless="tests.tb2.skip">
+ <target name="run-tb2-tests" depends="check-parameters,compile-tests">
<fileset dir="${test-output-dir}" id="tests-fileset">
<include name="**/**.java" />
</fileset>
@@ -174,7 +174,7 @@
<target name="run-and-clean-up" depends="check-parameters,remove-error-screens,run-tb2-tests" />
<!-- Runs all TestBench 2 tests -->
- <target name="tb2-tests">
+ <target name="tb2-tests" unless="tests.tb2.skip">
<property name="test-output-dir" location="${test.xml.dir}/result/testbench-junit-classes" />
<property name="retries" value="2" />