Mercurial > jdk8-mips64-public > nashorn / changeset

     1.1 --- a/make/build-benchmark.xml	Thu Sep 19 13:34:01 2013 +0530
     1.2 +++ b/make/build-benchmark.xml	Thu Sep 19 15:39:01 2013 +0200
     1.3 @@ -329,7 +329,7 @@
     1.4            fork="true"
     1.5            dir=".">
     1.6        <jvmarg line="${ext.class.path}"/>
     1.7 -      <jvmarg line="${run.test.jvmargs.octane}"/>
     1.8 +      <jvmarg line="${run.test.jvmargs.octane} -Xms${run.test.xms} -Xmx${run.test.xmx}"/>
     1.9        <arg value="${octane-test-sys-prop.test.js.framework}"/>
    1.10        <arg value="--"/>
    1.11        <arg value="${octane-tests}"/>
    1.12 @@ -357,7 +357,7 @@
    1.13            classpath="${run.test.classpath}"
    1.14            fork="true"
    1.15            dir=".">
    1.16 -      <jvmarg line="${run.test.jvmargs.octane}"/>
    1.17 +      <jvmarg line="${run.test.jvmargs.octane} -Xms${run.test.xms} -Xmx${run.test.xmx}"/>
    1.18        <arg value="${octane-test-sys-prop.test.js.framework}"/>
    1.19        <arg value="${octane-tests}"/>
    1.20        <arg value="--runtime"/>
    1.21 @@ -391,7 +391,7 @@
    1.22            fork="true"
    1.23            dir=".">
    1.24        <jvmarg line="${ext.class.path}"/>
    1.25 -      <jvmarg line="${run.test.jvmargs}"/>
    1.26 +      <jvmarg line="${run.test.jvmargs} -Xmx${run.test.xmx}"/>
    1.27        <arg value="-timezone=PST"/>
    1.28        <arg value="--class-cache-size=50"/>
    1.29        <arg value="${sunspider-test-sys-prop.test.js.framework}"/>
    1.30 @@ -415,7 +415,7 @@
    1.31            classpath="${run.test.classpath}"
    1.32            fork="true"
    1.33            dir=".">
    1.34 -      <jvmarg line="${run.test.jvmargs}"/>
    1.35 +      <jvmarg line="${run.test.jvmargs} -Xmx${run.test.xmx}"/>
    1.36        <arg value="${sunspider-test-sys-prop.test.js.framework}"/>
    1.37        <arg value="${sunspider-tests}/"/>
    1.38      </java>

     2.1 --- a/make/build.xml	Thu Sep 19 13:34:01 2013 +0530
     2.2 +++ b/make/build.xml	Thu Sep 19 15:39:01 2013 +0200
     2.3 @@ -66,6 +66,8 @@
     2.4  
     2.5      <echo message="run.test.jvmargs=${run.test.jvmargs}"/>
     2.6      <echo message="run.test.jvmargs.octane=${run.test.jvmargs.octane}"/>
     2.7 +    <echo message="run.test.xms=${run.test.xms}"/>
     2.8 +    <echo message="run.test.xmx=${run.test.xmx}"/>
     2.9  
    2.10    </target>
    2.11  
    2.12 @@ -320,7 +322,7 @@
    2.13      <testng outputdir="${build.test.results.dir}" classfilesetref="test.classes"
    2.14         verbose="${testng.verbose}" haltonfailure="true" useDefaultListeners="false" listeners="${testng.listeners}" workingDir="${basedir}">
    2.15        <jvmarg line="${ext.class.path}"/>
    2.16 -      <jvmarg line="${run.test.jvmargs} ${run.test.jvmsecurityargs}"/>
    2.17 +      <jvmarg line="${run.test.jvmargs} -Xmx${run.test.xmx} ${run.test.jvmsecurityargs}"/>
    2.18        <propertyset>
    2.19          <propertyref prefix="test-sys-prop."/>
    2.20          <mapper from="test-sys-prop.*" to="*" type="glob"/>
    2.21 @@ -336,7 +338,7 @@
    2.22        <!-- use just build.test.classes.dir to avoid referring to TestNG -->
    2.23        <java classname="${parallel.test.runner}" dir="${basedir}" classpath="${build.test.classes.dir}" failonerror="true" fork="true">
    2.24        <jvmarg line="${ext.class.path}"/>
    2.25 -      <jvmarg line="${run.test.jvmargs} ${run.test.jvmsecurityargs}"/>
    2.26 +      <jvmarg line="${run.test.jvmargs} -Xmx${run.test.xmx} ${run.test.jvmsecurityargs}"/>
    2.27        <syspropertyset>
    2.28            <propertyref prefix="test-sys-prop."/>
    2.29            <mapper type="glob" from="test-sys-prop.*" to="*"/>
    2.30 @@ -352,7 +354,7 @@
    2.31      <testng outputdir="${build.test.results.dir}" classfilesetref="test.classes"
    2.32         verbose="${testng.verbose}" haltonfailure="true" useDefaultListeners="false" listeners="${testng.listeners}" workingDir="${basedir}">
    2.33        <jvmarg line="${ext.class.path}"/>
    2.34 -      <jvmarg line="${run.test.jvmargs} ${run.test.jvmsecurityargs}"/>
    2.35 +      <jvmarg line="${run.test.jvmargs} -Xmx${run.test.xmx} ${run.test.jvmsecurityargs}"/>
    2.36        <propertyset>
    2.37          <propertyref prefix="test262-test-sys-prop."/>
    2.38          <mapper from="test262-test-sys-prop.*" to="*" type="glob"/>
    2.39 @@ -369,7 +371,7 @@
    2.40      <!-- use just build.test.classes.dir to avoid referring to TestNG -->
    2.41      <java classname="${parallel.test.runner}" dir="${basedir}" fork="true">
    2.42        <jvmarg line="${ext.class.path}"/>
    2.43 -      <jvmarg line="${run.test.jvmargs} ${run.test.jvmsecurityargs}"/>
    2.44 +      <jvmarg line="${run.test.jvmargs} -Xmx${run.test.xmx} ${run.test.jvmsecurityargs}"/>
    2.45        <classpath>
    2.46            <pathelement path="${run.test.classpath}"/>
    2.47        </classpath>
    2.48 @@ -387,7 +389,7 @@
    2.49        description="Run the shell with a sample script">
    2.50      <java classname="${nashorn.shell.tool}" fork="true" dir="samples">
    2.51          <jvmarg line="${ext.class.path}"/>
    2.52 -        <jvmarg line="${run.test.jvmargs}"/>
    2.53 +        <jvmarg line="${run.test.jvmargs} -Xmx${run.test.xmx}"/>
    2.54          <arg value="-dump-on-error"/>
    2.55          <arg value="test.js"/>
    2.56      </java>
    2.57 @@ -397,7 +399,7 @@
    2.58        description="Debug the shell with a sample script">
    2.59      <java classname="${nashorn.shell.tool}" fork="true" dir="samples">
    2.60          <jvmarg line="${ext.class.path}"/>
    2.61 -        <jvmarg line="${run.test.jvmargs}"/>
    2.62 +        <jvmarg line="${run.test.jvmargs} -Xmx${run.test.xmx}"/>
    2.63          <arg value="--print-code"/>
    2.64          <arg value="--verify-code"/>
    2.65          <arg value="--print-symbols"/>

     3.1 --- a/make/project.properties	Thu Sep 19 13:34:01 2013 +0530
     3.2 +++ b/make/project.properties	Thu Sep 19 15:39:01 2013 +0200
     3.3 @@ -216,13 +216,14 @@
     3.4  src.dir=src
     3.5  test.src.dir=test/src
     3.6  
     3.7 +# -Xmx is used for all tests, -Xms only for octane benchmark
     3.8  run.test.xmx=3G
     3.9  run.test.xms=2G
    3.10  
    3.11  run.test.user.language=tr
    3.12  run.test.user.country=TR
    3.13  
    3.14 -run.test.jvmargs.common=-server -Xmx${run.test.xmx} -XX:+TieredCompilation -Dfile.encoding=UTF-8 -Duser.language=${run.test.user.language} -Duser.country=${run.test.user.country} -XX:+HeapDumpOnOutOfMemoryError
    3.15 +run.test.jvmargs.common=-server -XX:+TieredCompilation -Dfile.encoding=UTF-8 -Duser.language=${run.test.user.language} -Duser.country=${run.test.user.country} -XX:+HeapDumpOnOutOfMemoryError
    3.16  
    3.17  #-XX:-UseCompressedKlassPointers -XX:+PrintHeapAtGC -XX:ClassMetaspaceSize=300M
    3.18  # -XX:+PrintCompilation -XX:+UnlockDiagnosticVMOptions -XX:+PrintNMethods
    3.19 @@ -231,12 +232,12 @@
    3.20  run.test.jvmargs.main=${run.test.jvmargs.common} -ea
    3.21  
    3.22  #-XX:-UseCompressedKlassPointers -XX:+PrintHeapAtGC -XX:ClassMetaspaceSize=300M  
    3.23 -run.test.jvmargs.octane.main=-Xms${run.test.xms} ${run.test.jvmargs.common}
    3.24 +run.test.jvmargs.octane.main=${run.test.jvmargs.common}
    3.25  
    3.26  run.test.jvmsecurityargs=-Xverify:all -Djava.security.properties=${basedir}/make/java.security.override -Djava.security.manager -Djava.security.policy=${basedir}/build/nashorn.policy
    3.27  
    3.28  # VM options for script tests with @fork option
    3.29 -test-sys-prop.test.fork.jvm.options=${run.test.jvmargs.main} ${run.test.jvmsecurityargs}
    3.30 +test-sys-prop.test.fork.jvm.options=${run.test.jvmargs.main} -Xmx${run.test.xmx} ${run.test.jvmsecurityargs}
    3.31  
    3.32  # path of rhino.jar for benchmarks
    3.33  rhino.jar=