1.1 --- a/make/build.xml Thu Sep 19 13:34:01 2013 +0530
1.2 +++ b/make/build.xml Thu Sep 19 15:39:01 2013 +0200
1.3 @@ -66,6 +66,8 @@
1.4
1.5 <echo message="run.test.jvmargs=${run.test.jvmargs}"/>
1.6 <echo message="run.test.jvmargs.octane=${run.test.jvmargs.octane}"/>
1.7 + <echo message="run.test.xms=${run.test.xms}"/>
1.8 + <echo message="run.test.xmx=${run.test.xmx}"/>
1.9
1.10 </target>
1.11
1.12 @@ -320,7 +322,7 @@
1.13 <testng outputdir="${build.test.results.dir}" classfilesetref="test.classes"
1.14 verbose="${testng.verbose}" haltonfailure="true" useDefaultListeners="false" listeners="${testng.listeners}" workingDir="${basedir}">
1.15 <jvmarg line="${ext.class.path}"/>
1.16 - <jvmarg line="${run.test.jvmargs} ${run.test.jvmsecurityargs}"/>
1.17 + <jvmarg line="${run.test.jvmargs} -Xmx${run.test.xmx} ${run.test.jvmsecurityargs}"/>
1.18 <propertyset>
1.19 <propertyref prefix="test-sys-prop."/>
1.20 <mapper from="test-sys-prop.*" to="*" type="glob"/>
1.21 @@ -336,7 +338,7 @@
1.22 <!-- use just build.test.classes.dir to avoid referring to TestNG -->
1.23 <java classname="${parallel.test.runner}" dir="${basedir}" classpath="${build.test.classes.dir}" failonerror="true" fork="true">
1.24 <jvmarg line="${ext.class.path}"/>
1.25 - <jvmarg line="${run.test.jvmargs} ${run.test.jvmsecurityargs}"/>
1.26 + <jvmarg line="${run.test.jvmargs} -Xmx${run.test.xmx} ${run.test.jvmsecurityargs}"/>
1.27 <syspropertyset>
1.28 <propertyref prefix="test-sys-prop."/>
1.29 <mapper type="glob" from="test-sys-prop.*" to="*"/>
1.30 @@ -352,7 +354,7 @@
1.31 <testng outputdir="${build.test.results.dir}" classfilesetref="test.classes"
1.32 verbose="${testng.verbose}" haltonfailure="true" useDefaultListeners="false" listeners="${testng.listeners}" workingDir="${basedir}">
1.33 <jvmarg line="${ext.class.path}"/>
1.34 - <jvmarg line="${run.test.jvmargs} ${run.test.jvmsecurityargs}"/>
1.35 + <jvmarg line="${run.test.jvmargs} -Xmx${run.test.xmx} ${run.test.jvmsecurityargs}"/>
1.36 <propertyset>
1.37 <propertyref prefix="test262-test-sys-prop."/>
1.38 <mapper from="test262-test-sys-prop.*" to="*" type="glob"/>
1.39 @@ -369,7 +371,7 @@
1.40 <!-- use just build.test.classes.dir to avoid referring to TestNG -->
1.41 <java classname="${parallel.test.runner}" dir="${basedir}" fork="true">
1.42 <jvmarg line="${ext.class.path}"/>
1.43 - <jvmarg line="${run.test.jvmargs} ${run.test.jvmsecurityargs}"/>
1.44 + <jvmarg line="${run.test.jvmargs} -Xmx${run.test.xmx} ${run.test.jvmsecurityargs}"/>
1.45 <classpath>
1.46 <pathelement path="${run.test.classpath}"/>
1.47 </classpath>
1.48 @@ -387,7 +389,7 @@
1.49 description="Run the shell with a sample script">
1.50 <java classname="${nashorn.shell.tool}" fork="true" dir="samples">
1.51 <jvmarg line="${ext.class.path}"/>
1.52 - <jvmarg line="${run.test.jvmargs}"/>
1.53 + <jvmarg line="${run.test.jvmargs} -Xmx${run.test.xmx}"/>
1.54 <arg value="-dump-on-error"/>
1.55 <arg value="test.js"/>
1.56 </java>
1.57 @@ -397,7 +399,7 @@
1.58 description="Debug the shell with a sample script">
1.59 <java classname="${nashorn.shell.tool}" fork="true" dir="samples">
1.60 <jvmarg line="${ext.class.path}"/>
1.61 - <jvmarg line="${run.test.jvmargs}"/>
1.62 + <jvmarg line="${run.test.jvmargs} -Xmx${run.test.xmx}"/>
1.63 <arg value="--print-code"/>
1.64 <arg value="--verify-code"/>
1.65 <arg value="--print-symbols"/>
