Revert "Tests now run in many threads in the same JVM instead of forking off a new...

This reverts [17666].

svn changeset:17677/svn branch:6.5

diff --git a/tests/test.xml b/tests/test.xml
index 6a46959aff9f0bd4291d7e98d5bf2e093021d831..c7ee8608406fddb7c0b6077940364ba36e7a3c76 100644 (file)
--- a/tests/test.xml
+++ b/tests/test.xml
@@ -169,25 +169,25 @@
 
        <!-- This target runs the generated and compiled junit tests -->
        <target name="execute-tests">
-               <junit fork="no" printsummary="withOutAndErr">
+               <junit fork="yes" printsummary="withOutAndErr">
                        <classpath>
                                <path refid="classpath" />
                                <pathelement path="${class-dir}" />
                        </classpath>
-                       
-                       <sysproperty key="com.vaadin.testbench.tester.host" value="${com.vaadin.testbench.tester.host}" />
-            <sysproperty key="com.vaadin.testbench.deployment.url" value="${com.vaadin.testbench.deployment.url}" />
-            <!-- Define where the reference screenshots and diff files are saved -->
-            <sysproperty key="com.vaadin.testbench.screenshot.directory" value="${com.vaadin.testbench.screenshot.directory}" />
-            <!-- Resolution for screenshots -->
-            <sysproperty key="com.vaadin.testbench.screenshot.resolution" value="${com.vaadin.testbench.screenshot.resolution}" />
-
-            <!-- true/false system arguments -->
-            <sysproperty key="com.vaadin.testbench.screenshot.softfail" value="${com.vaadin.testbench.screenshot.softfail}" />
-            <sysproperty key="com.vaadin.testbench.screenshot.reference.debug" value="${com.vaadin.testbench.screenshot.reference.debug}" />
-            <sysproperty key="com.vaadin.testbench.screenshot.cursor" value="${com.vaadin.testbench.screenshot.cursor}" />
-
-            <sysproperty key="java.awt.headless" value="true" />
+
+                       <jvmarg value="-Dcom.vaadin.testbench.tester.host=${com.vaadin.testbench.tester.host}" />
+                       <jvmarg value="-Dcom.vaadin.testbench.deployment.url=${com.vaadin.testbench.deployment.url}" />
+                       <!-- Define where the reference screenshots and diff files are saved -->
+                       <jvmarg value="-Dcom.vaadin.testbench.screenshot.directory=${com.vaadin.testbench.screenshot.directory}" />
+                       <!-- Resolution for screenshots -->
+                       <jvmarg value="-Dcom.vaadin.testbench.screenshot.resolution=${com.vaadin.testbench.screenshot.resolution}" />
+
+                       <jvmarg value="-Djava.awt.headless=true" />
+
+                       <!-- true/false system arguments -->
+                       <jvmarg value="-Dcom.vaadin.testbench.screenshot.softfail=${com.vaadin.testbench.screenshot.softfail}" />
+                       <jvmarg value="-Dcom.vaadin.testbench.screenshot.reference.debug=${com.vaadin.testbench.screenshot.reference.debug}" />
+                       <jvmarg value="-Dcom.vaadin.testbench.screenshot.cursor=${com.vaadin.testbench.screenshot.cursor}" />
 
                        <batchtest>
                                <filelist dir="${test-output-dir}" files="${target}" />