# HG changeset patch
# User sundar
# Date 1357908978 -19800
# Node ID 45718b3a87eb54dad6ec951f2dee4d1047ac8153
# Parent f0c2082879831d2328a1ddfe992a240007f41e95
8006082: Provide option to run octane benchmarks in separate processes
Reviewed-by: lagergren, jlaskey
diff -r f0c208287983 -r 45718b3a87eb nashorn/make/build-benchmark.xml
--- a/nashorn/make/build-benchmark.xml Fri Jan 11 10:40:51 2013 +0100
+++ b/nashorn/make/build-benchmark.xml Fri Jan 11 18:26:18 2013 +0530
@@ -30,205 +30,276 @@
-
-
-
+
+
+
+
-
-
+
+
+
+
-
-
-
-
-
-
+
+
+
+
-
-
+
+
+
+
-
-
+
+
+
+
-
-
-
-
-
-
+
+
+
+
-
-
+
+
+
+
-
-
+
+
+
+
-
-
-
-
-
-
+
+
+
+
-
-
+
+
+
+
-
-
+
+
+
+
-
-
-
-
-
-
+
+
+
+
-
-
+
+
+
+
-
-
+
+
+
+
-
-
-
-
-
-
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
@@ -254,7 +325,6 @@
-
@@ -267,7 +337,6 @@
-
@@ -283,7 +352,6 @@
-
diff -r f0c208287983 -r 45718b3a87eb nashorn/make/project.properties
--- a/nashorn/make/project.properties Fri Jan 11 10:40:51 2013 +0100
+++ b/nashorn/make/project.properties Fri Jan 11 18:26:18 2013 +0530
@@ -156,13 +156,18 @@
# test root for octane
octane-test-sys-prop.test.js.roots=${test.external.dir}/octane/
+# run octane benchmars in separate processes?
+octane-test-sys-prop.separate.process=true
+
# framework root for octane
octane-test-sys-prop.test.js.framework=${test.basic.dir}/run-octane.js
# list of tests to be excluded
+# mandreel excluded due to OOM
octane-test-sys-prop.test.js.exclude.list=\
base.js \
- run.js
+ run.js \
+ mandreel.js
# test root for sunspider
sunspider-test-sys-prop.test.js.roots=${test.external.dir}/sunspider/tests/sunspider-1.0/