changeset 965:e84cfe70c504

8054993: type info cache may be disabled for test262 and tests explicitly changing that property should use @fork Reviewed-by: lagergren, hannesw
author sundar
date Wed, 13 Aug 2014 15:00:24 +0530
parents 11a4f68806bc
children c0dd84255936
files make/build.xml test/script/basic/compile-octane-normal.js test/script/basic/compile-octane-splitter.js
diffstat 3 files changed, 4 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/make/build.xml	Tue Aug 12 13:23:47 2014 +0200
+++ b/make/build.xml	Wed Aug 13 15:00:24 2014 +0530
@@ -519,6 +519,8 @@
     <java classname="${parallel.test.runner}" dir="${basedir}" fork="true">
       <jvmarg line="${ext.class.path}"/>
       <jvmarg line="${run.test.jvmargs} -Xmx${run.test.xmx} ${run.test.jvmsecurityargs} -Dbuild.dir=${build.dir}"/>
+      <!-- avoid too many typeinfo cache files. Each script is run only once anyway -->
+      <jvmarg line="-Dnashorn.typeInfo.disabled=true"/>
       <classpath>
           <pathelement path="${run.test.classpath}"/>
       </classpath>
--- a/test/script/basic/compile-octane-normal.js	Tue Aug 12 13:23:47 2014 +0200
+++ b/test/script/basic/compile-octane-normal.js	Wed Aug 13 15:00:24 2014 +0530
@@ -29,6 +29,7 @@
  * forever, so make this test future safe, we specify them explicitly
  *
  * @test
+ * @fork
  * @runif external.octane
  * @option -scripting
  * @option -Dnashorn.typeInfo.disabled=true
--- a/test/script/basic/compile-octane-splitter.js	Tue Aug 12 13:23:47 2014 +0200
+++ b/test/script/basic/compile-octane-splitter.js	Wed Aug 13 15:00:24 2014 +0530
@@ -29,6 +29,7 @@
  * forever, so make this test future safe, we specify them explicitly
  *
  * @test
+ * @fork
  * @option -Dnashorn.compiler.splitter.threshold=1000
  * @fork
  * @runif external.octane