diff options
| author | Mikael Grankvist <mikael.grankvist@itmill.com> | 2010-06-22 09:33:49 +0000 |
|---|---|---|
| committer | Mikael Grankvist <mikael.grankvist@itmill.com> | 2010-06-22 09:33:49 +0000 |
| commit | b8c51727b67c378506a487808c7e4f27962010ed (patch) | |
| tree | a2d397a75ca0f9ed8066e2d7c48fdb7cd563ea93 /tests/test.xml | |
| parent | a021d2727fefac758919367a4f27b1032ec5f94e (diff) | |
| download | vaadin-framework-b8c51727b67c378506a487808c7e4f27962010ed.tar.gz vaadin-framework-b8c51727b67c378506a487808c7e4f27962010ed.zip | |
Changed test parallelisation from foreach to for
Lifray test update
svn changeset:13853/svn branch:6.4
Diffstat (limited to 'tests/test.xml')
| -rw-r--r-- | tests/test.xml | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/tests/test.xml b/tests/test.xml index 24db864588..82ccad9730 100644 --- a/tests/test.xml +++ b/tests/test.xml @@ -17,7 +17,7 @@ <property name="test-output-dir" value="../build/test-output" /> <property name="class-dir" value="${test-output-dir}/classes" /> - <taskdef resource="net/sf/antcontrib/antcontrib.properties"> + <taskdef resource="net/sf/antcontrib/antlib.xml"> <classpath> <pathelement location="../build/lib/ant-contrib-1.0b3.jar"/> </classpath> @@ -106,11 +106,16 @@ </target> <target name="run-tests" depends="compile-tests" if="server.start.succeeded"> - <foreach maxthreads="20" parallel="true" target="execute-tests" param="target"> + <for threadCount="20" parallel="true" keepgoing="true" param="target"> <path> <fileset dir="${test-output-dir}" includes="**/**.java" /> </path> - </foreach> + <sequential> + <antcall target="execute-tests"> + <param name="target" value="@{target}" /> + </antcall> + </sequential> + </for> </target> <!-- This target runs the generated and compiled junit tests --> @@ -136,7 +141,7 @@ <filelist dir="${test-output-dir}" files="${target}" /> </batchtest> </junit> - + </target> <!-- Remove temporary source and compiled java files --> |