Reviewers: skybrian,
Description:
Increase heap size for testing to prevent GC thrashing and OOMs when
running usr/BigIntegerSuite.
Please review this at http://gwt-code-reviews.appspot.com/1750803/
Affected files:
M common.ant.xml
Index: common.ant.xml
===================================================================
--- common.ant.xml (revision 11106)
+++ common.ant.xml (working copy)
@@ -43,7 +43,7 @@
<property name="gwt.build.jni" location="${gwt.build}/jni" />
<property name="gwt.build.staging" location="${gwt.build}/staging" />
<property name="gwt.build.dist" location="${gwt.build}/dist" />
- <!-- gwt.threadsPerProcessor supercedes gwt.threadCount unless set to 0
-->
+ <!-- gwt.threadsPerProcessor supercedes gwt.threadCount unless set to 0
-->
<property name="gwt.threadsPerProcessor" value="1" />
<property name="gwt.threadCount" value="1" />
<property name="project.build"
location="${gwt.build.out}/${project.tail}" />
@@ -61,7 +61,7 @@
<property name="junit.out" location="${project.build}/test" />
<property name="emma.dir" value="${gwt.tools.redist}/emma" />
<property name="emma.filter.exclude" value="" />
-
+
<!-- Sanity check -->
<available file="${gwt.tools}" type="dir" property="gwt.tools.exists" />
<fail unless="gwt.tools.exists" message="Cannot find '${gwt.tools}'
tools directory; perhaps you should define the GWT_TOOLS environment
variable" />
@@ -96,16 +96,16 @@
<isset property="build.host.iswindows" />
</condition>
<fail unless="build.host.platform" message="Building on ${os.name} is
not supported" />
-
+
<!-- JVM -->
<condition property="build.jvm.is15">
<equals arg1="${ant.java.version}" arg2="1.5"/>
- </condition>
+ </condition>
<condition property="build.jvm.is16">
<equals arg1="${ant.java.version}" arg2="1.6"/>
- </condition>
-
+ </condition>
+
<!-- JUnit support -->
<property name="gwt.dev.staging.jar"
location="${gwt.build.staging}/gwt-${gwt.version}/gwt-dev.jar" />
<property name="gwt.junit.port" value="8888" />
@@ -128,15 +128,15 @@
<pathelement location="${gwt.tools.antlib}/ant-contrib-1.0b3.jar" />
</classpath>
</taskdef>
-
-
+
+
<!-- Pulls in tasks defined in antcount, i.e. countfilter -->
<taskdef resource="net/sf/antcount/antlib.xml">
<classpath>
<pathelement location="${gwt.tools.antlib}/antcount-1.2.jar" />
</classpath>
</taskdef>
-
+
<!-- Global Custom Tasks -->
<presetdef name="gwt.ant">
@@ -209,7 +209,7 @@
<junit dir="@{test.out}" fork="yes" printsummary="yes"
failureproperty="junit.failure" tempdir="@{test.out}">
- <jvmarg line="-Xmx768m" />
+ <jvmarg line="-Xmx1024m" />
<jvmarg line="-Xss4M" />
<jvmarg
value="-Demma.coverage.out.file=@{test.emma.coverage}/coverage.emma" />
<jvmarg value="-Demma.coverage.out.merge=true" />
@@ -260,7 +260,7 @@
</report>
</emma>
- <condition property="junit.stop.build" value="true">
+ <condition property="junit.stop.build" value="true">
<and>
<istrue value="@{haltonfailure}"/>
<isset property="junit.failure"/>
@@ -295,16 +295,16 @@
be noticed as invalidating the previously-generated filter
output. This property
names where such a sentinel lives; it is tested with <available/>
and created
with <touch/> -->
- <mkdir dir="${project.build}/sentinels" />
- <property name="filter.sentinel"
-
location="${project.build}/sentinels/gwt-${gwt.version}-svn-${gwt.svnrev.filename}"
/>
- </sequential>
- </macrodef>
-
+ <mkdir dir="${project.build}/sentinels" />
+ <property name="filter.sentinel"
+
location="${project.build}/sentinels/gwt-${gwt.version}-svn-${gwt.svnrev.filename}"
/>
+ </sequential>
+ </macrodef>
+
<macrodef name="gwt.revfilter" description="Filters files for
versioning">
<attribute name="todir" description="Destination for the filtered
copy"/>
-
- <element name="src.fileset" implicit="true"
+
+ <element name="src.fileset" implicit="true"
description="Source for the filtered copy"/>
<sequential>
<!-- These files must be filtered for versioning -->
@@ -324,7 +324,7 @@
<attribute name="name"/>
<element name="timer.elements" implicit="true" optional="false"/>
<sequential>
- <taskdef name="timer"
+ <taskdef name="timer"
classname="com.google.gwt.ant.taskdefs.Timer"
classpath="${gwt.build.lib}/ant-gwt.jar" />
<timer name="@{name}">
@@ -380,7 +380,7 @@
</sequential>
</macrodef>
- <!-- Targets for emma support. To run tests with emma enabled, use
+ <!-- Targets for emma support. To run tests with emma enabled, use
ant <test-target> -Demma.enabled=true -->
<path id="emma.taskdef.lib">
<pathelement location="${emma.dir}/emma-2.0.5312-patched.jar" />
--
http://groups.google.com/group/Google-Web-Toolkit-Contributors
