Two small config changes:
(i) Instead of batching by default for all tests, do it individually for each test
target except draftCompile. draftCompile is failing, only on the build machine,
when batching is turned on.
(ii) Moved draftCompile back into the parallel task, as before.
git-svn-id: https://google-web-toolkit.googlecode.com/svn/trunk@5796 8db76d5a-ed1c-0410-87a9-c151d255dfc7
diff --git a/common.ant.xml b/common.ant.xml
index 0548bd9..37cfcce 100755
--- a/common.ant.xml
+++ b/common.ant.xml
@@ -182,7 +182,7 @@
failureproperty="junit.failure" tempdir="@{test.out}" >
<jvmarg line="${junit.platform.args}" />
<jvmarg line="-Xmx768m" />
- <sysproperty key="gwt.args" value="${junit.notheadless.arg} @{test.args} -batch module" />
+ <sysproperty key="gwt.args" value="${junit.notheadless.arg} @{test.args}" />
<sysproperty key="java.awt.headless" value="${junit.headless}" />
<sysproperty key="gwt.devjar" value="${gwt.dev.staging.jar}" />
<classpath>
diff --git a/user/build.xml b/user/build.xml
index 0d83ebd..7c68dbd 100755
--- a/user/build.xml
+++ b/user/build.xml
@@ -115,7 +115,7 @@
<target name="test.remoteweb" description="Run a remoteweb test at the given host and path" if="gwt.remote.browsers">
<echo message="Performing remote browser testing at ${gwt.remote.browsers}" />
- <gwt.junit test.args="${test.args} -out www -remoteweb ${gwt.remote.browsers}" test.out="${junit.out}/remoteweb" test.cases="default.web.tests" >
+ <gwt.junit test.args="${test.args} -out www -remoteweb ${gwt.remote.browsers} -batch module" test.out="${junit.out}/remoteweb" test.cases="default.web.tests" >
<extraclasspaths>
<path refid="test.extraclasspath" />
</extraclasspaths>
@@ -128,7 +128,7 @@
<target name="test.selenium" description="Run a remote test using Selenium RC test at the given host and path" if="gwt.selenium.hosts">
<echo message="Performing remote browser testing using Selenium RC at ${gwt.selenium.hosts}" />
- <gwt.junit test.args="${test.args} -out www -selenium ${gwt.selenium.hosts}" test.out="${junit.out}/selenium" test.cases="default.web.tests" >
+ <gwt.junit test.args="${test.args} -out www -selenium ${gwt.selenium.hosts} -batch module" test.out="${junit.out}/selenium" test.cases="default.web.tests" >
<extraclasspaths>
<path refid="test.extraclasspath" />
</extraclasspaths>
@@ -136,7 +136,7 @@
</target>
<target name="test.hosted.emma" depends="compile, compile.tests" description="Run all hosted-mode tests in emma mode.">
- <gwt.junit test.args="${test.args}" test.out="${junit.out}/${build.host.platform}-hosted-mode-emma" test.cases="default.hosted.emma.tests" >
+ <gwt.junit test.args="${test.args} -batch module" test.out="${junit.out}/${build.host.platform}-hosted-mode-emma" test.cases="default.hosted.emma.tests" >
<extraclasspaths>
<path refid="test.extraclasspath" />
<pathelement location="${gwt.tools.redist}/emma/emma.jar" />
@@ -145,7 +145,7 @@
</target>
<target name="test.hosted" depends="compile, compile.tests" description="Run only hosted-mode tests for this project.">
- <gwt.junit test.args="${test.args}" test.out="${junit.out}/${build.host.platform}-hosted-mode" test.cases="default.hosted.tests" >
+ <gwt.junit test.args="${test.args} -batch module" test.out="${junit.out}/${build.host.platform}-hosted-mode" test.cases="default.hosted.tests" >
<extraclasspaths>
<path refid="test.extraclasspath" />
</extraclasspaths>
@@ -153,7 +153,7 @@
</target>
<target name="test.noserver" depends="compile, compile.tests" description="Run noserver hosted-mode tests for this project.">
- <gwt.junit test.args="${test.args} -noserver" test.out="${junit.out}/${build.host.platform}-noserver-mode" test.cases="default.noserver.tests">
+ <gwt.junit test.args="${test.args} -noserver -batch module" test.out="${junit.out}/${build.host.platform}-noserver-mode" test.cases="default.noserver.tests">
<extraclasspaths>
<path refid="test.extraclasspath" />
</extraclasspaths>
@@ -161,7 +161,7 @@
</target>
<target name="test.web" depends="compile, compile.tests" description="Run only web-mode tests for this project.">
- <gwt.junit test.args="${test.args} -out www -web" test.out="${junit.out}/${build.host.platform}-web-mode" test.cases="default.web.tests">
+ <gwt.junit test.args="${test.args} -out www -web -batch module" test.out="${junit.out}/${build.host.platform}-web-mode" test.cases="default.web.tests">
<extraclasspaths>
<path refid="test.extraclasspath" />
</extraclasspaths>
@@ -169,14 +169,14 @@
</target>
<target name="test.web.disableClassMetadata" depends="compile, compile.tests" description="Run only web-mode tests for this project.">
- <gwt.junit test.args="${test.args} -XdisableClassMetadata -out www -web" test.out="${junit.out}/${build.host.platform}-web-mode-disableClassMetadata" test.cases="default.web.tests" >
+ <gwt.junit test.args="${test.args} -XdisableClassMetadata -out www -web -batch module" test.out="${junit.out}/${build.host.platform}-web-mode-disableClassMetadata" test.cases="default.web.tests" >
<extraclasspaths>
<path refid="test.extraclasspath" />
</extraclasspaths>
</gwt.junit>
</target>
- <target name="test.web.draft" depends="compile, compile.tests" description="Run only web-mode tests for this project.">
+ <target name="test.web.draft" depends="compile, compile.tests" description="Run only web-mode tests for this project, not batching tests on purpose.">
<gwt.junit test.args="${test.args} -draftCompile -out www -web" test.out="${junit.out}/${build.host.platform}-web-mode-draft" test.cases="default.web.tests" >
<extraclasspaths>
<path refid="test.extraclasspath" />
@@ -202,8 +202,8 @@
<antcall target="test.noserver"/>
<antcall target="test.web"/>
<antcall target="test.web.disableClassMetadata"/>
+ <antcall target="test.web.draft"/>
</parallel>
- <antcall target="test.web.draft"/>
</limit>
</target>
