aboutsummaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorArtur Signell <artur.signell@itmill.com>2010-04-08 15:07:12 +0000
committerArtur Signell <artur.signell@itmill.com>2010-04-08 15:07:12 +0000
commit05b8a2b58cdb8503bc0c020cabfd36965790200c (patch)
tree362ade3ffd708021b38cd10452b4ca085b3546f8 /build
parent7a774c5f3b399da4e0221eae593bb703a8f40210 (diff)
downloadvaadin-framework-05b8a2b58cdb8503bc0c020cabfd36965790200c.tar.gz
vaadin-framework-05b8a2b58cdb8503bc0c020cabfd36965790200c.zip
Run tests in parallel (#4493)
Removed extra "ant-tests" which served no purpose svn changeset:12396/svn branch:6.3
Diffstat (limited to 'build')
-rw-r--r--build/build.xml19
1 files changed, 7 insertions, 12 deletions
diff --git a/build/build.xml b/build/build.xml
index 3c48ada9e6..6412a35ec1 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -1097,7 +1097,13 @@
<!-- Automated tests. -->
<!-- ================================================================== -->
- <target name="tests" depends="ant-tests, server-side-tests, testbench-tests, integration-tests">
+ <target name="tests">
+ <!-- Run all different types of tests in parallel to decrease testing time -->
+ <parallel threadcount="3">
+ <antcall target="server-side-tests"></antcall>
+ <antcall target="testbench-tests"></antcall>
+ <antcall target="integration-tests"></antcall>
+ </parallel>
</target>
<target name="server-side-tests" depends="compile-java">
@@ -1144,17 +1150,6 @@
</ant>
</target>
- <target name="ant-tests">
- <echo>##teamcity[testSuiteStarted name='com.vaadin.tests.test-framework']</echo>
-
- <!-- A smoke test for testing the testing framework. -->
- <echo>##teamcity[testStarted name='testingSmoketest']</echo>
- <echo>##teamcity[testStdOut name='testingSmoketest' out='Here be some text related to the test.]</echo>
- <echo>##teamcity[testFinished name='testingSmoketest']</echo>
-
- <echo>##teamcity[testSuiteFinished name='com.vaadin.tests.test-framework']</echo>
- </target>
-
<target name="integration-tests" depends="internal-package-war">
<!-- Parameters for the test.xml script. -->
<fail unless="com.vaadin.testbench.tester.host" message="The 'com.vaadin.testbench.tester.host' property must be defined."/>