diff options
| author | Artur Signell <artur.signell@itmill.com> | 2009-11-03 07:05:33 +0000 |
|---|---|---|
| committer | Artur Signell <artur.signell@itmill.com> | 2009-11-03 07:05:33 +0000 |
| commit | bc183c636aa51a5c4817e538297e7d049022a17d (patch) | |
| tree | 9d4cf03490336bec3327cc8cd680d61c0b750fc8 /tests | |
| parent | 639032d90bc083e35afab501d09f91e2e50333bd (diff) | |
| download | vaadin-framework-bc183c636aa51a5c4817e538297e7d049022a17d.tar.gz vaadin-framework-bc183c636aa51a5c4817e538297e7d049022a17d.zip | |
Merged [9586]: Cleaned up parameters. Renamed test-browsers to browsers.
Added more parallelism to tests
svn changeset:9587/svn branch:6.2
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/test.xml | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/tests/test.xml b/tests/test.xml index 20d7649e96..c841f8e03b 100644 --- a/tests/test.xml +++ b/tests/test.xml @@ -4,14 +4,19 @@ <!-- ================================================================== --> <!-- Configuration --> <!-- ================================================================== --> - <!-- Temporary output directory, created and removed by this script --> - <property name="test-output-dir" value="../build/test-output" /> - <property name="class-dir" value="${test-output-dir}/classes" /> + <!-- Browsers to use for testing --> + <property name="browsers" value="winxp-ie6,winxp-ie7,winxp-ie8,winxp-firefox35,winxp-safari4,winxp-googlechrome3,winxp-opera10" /> + + <!-- Screen shot base directory --> <property name="com.vaadin.testbench.screenshot.directory" value="../tests/screenshots" /> + + <!-- Host running Testbench Hub --> <property name="com.vaadin.testbench.tester.host" value="192.168.1.44" /> - <!-- Browsers to use for testing --> - <property name="test-browsers" value="winxp-ie6,winxp-ie7,winxp-ie8,winxp-firefox35,winxp-safari4,winxp-googlechrome3,winxp-opera10" /> + <!-- Temporary output directory, created and removed by this script --> + <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"> <classpath> <pathelement location="../build/lib/ant-contrib-1.0b3.jar"/> @@ -38,7 +43,7 @@ <java classname="com.vaadin.testbench.util.TestConverter" classpathref="classpath"> <arg value="${test-output-dir}" /> - <arg value="${test-browsers}" /> + <arg value="${browsers}" /> <arg line="${testfiles}" /> </java> </target> @@ -99,8 +104,8 @@ <fail unless="com.vaadin.testbench.deployment.url" message="The 'com.vaadin.testbench.deployment.url' property must be defined." /> </target> - <target name="run-tests" depends="remove-error-screens,compile-tests"> - <foreach parallel="true" target="execute-tests" param="target"> + <target name="run-tests" depends="remove-error-screens, compile-tests"> + <foreach maxthreads="10" parallel="true" target="execute-tests" param="target"> <path> <fileset dir="${test-output-dir}" includes="**/**.java" /> </path> |