Revision: 6704 Author: [email protected] Date: Thu Nov 5 11:16:57 2009 Log: tr...@6460 was merged into this branch Prevent parallel javac compiles when running tests in parallel. svn merge --ignore-ancestry -c r6460 https://google-web-toolkit.googlecode.com/svn/trunk .
Patch by: jlabanca http://code.google.com/p/google-web-toolkit/source/detail?r=6704 Modified: /releases/2.0/branch-info.txt /releases/2.0/user/build.xml ======================================= --- /releases/2.0/branch-info.txt Thu Nov 5 11:00:13 2009 +++ /releases/2.0/branch-info.txt Thu Nov 5 11:16:57 2009 @@ -350,3 +350,8 @@ tr...@6483 was merged into this branch Use 'devMode' instead of 'hosted' in the ant files for the samples svn merge --ignore-ancestry -c r6483 https://google-web-toolkit.googlecode.com/svn/trunk . + +tr...@6460 was merged into this branch + Prevent parallel javac compiles when running tests in parallel. + svn merge --ignore-ancestry -c r6460 https://google-web-toolkit.googlecode.com/svn/trunk . + ======================================= --- /releases/2.0/user/build.xml Wed Nov 4 09:50:34 2009 +++ /releases/2.0/user/build.xml Thu Nov 5 11:16:57 2009 @@ -519,6 +519,10 @@ <target name="test.htmlunit" depends="compile, compile.tests" description="Run all HtmlUnit tests"> + <!-- Prevent compilation for every target. --> + <property name="compile.complete" value="true"/> + <property name="compile.tests.complete" value="true"/> + <property.ensure name="distro.built" location="${gwt.dev.staging.jar}" message="GWT must be built before performing any tests. This can be fixed by running ant in the ${gwt.root} directory." /> <limit failonerror="true" hours="${test.timeout}"> @@ -537,6 +541,10 @@ <target name="test.dev" depends="compile, compile.tests" description="Run dev-mode tests for this project."> + <!-- Prevent compilation for every target. --> + <property name="compile.complete" value="true"/> + <property name="compile.tests.complete" value="true"/> + <limit failonerror="true" hours="${test.timeout}"> <parallel threadsPerProcessor="${gwt.threadsPerProcessor}" threadCount="${gwt.threadCount}"> @@ -554,6 +562,10 @@ <target name="test.web" depends="compile, compile.tests" description="Run web-mode tests for this project."> + <!-- Prevent compilation for every target. --> + <property name="compile.complete" value="true"/> + <property name="compile.tests.complete" value="true"/> + <limit failonerror="true" hours="${test.timeout}"> <parallel threadsPerProcessor="${gwt.threadsPerProcessor}" threadCount="${gwt.threadCount}"> @@ -571,6 +583,10 @@ <target name="test.emma" depends="compile, compile.tests" description="Run emma tests for this project."> + <!-- Prevent compilation for every target. --> + <property name="compile.complete" value="true"/> + <property name="compile.tests.complete" value="true"/> + <limit failonerror="true" hours="${test.timeout}"> <parallel threadsPerProcessor="${gwt.threadsPerProcessor}" threadCount="${gwt.threadCount}"> @@ -588,6 +604,10 @@ <target name="test.draft" depends="compile, compile.tests" description="Run draft compiled tests for this project."> + <!-- Prevent compilation for every target. --> + <property name="compile.complete" value="true"/> + <property name="compile.tests.complete" value="true"/> + <limit failonerror="true" hours="${test.timeout}"> <parallel threadsPerProcessor="${gwt.threadsPerProcessor}" threadCount="${gwt.threadCount}"> @@ -605,6 +625,10 @@ <target name="test.nometa" depends="compile, compile.tests" description="Run -XdisableClassMetadata tests for this project."> + <!-- Prevent compilation for every target. --> + <property name="compile.complete" value="true"/> + <property name="compile.tests.complete" value="true"/> + <limit failonerror="true" hours="${test.timeout}"> <parallel threadsPerProcessor="${gwt.threadsPerProcessor}" threadCount="${gwt.threadCount}"> --~--~---------~--~----~------------~-------~--~----~ http://groups.google.com/group/Google-Web-Toolkit-Contributors -~----------~----~----~----~------~----~------~--~---
