aboutsummaryrefslogtreecommitdiff
path: root/make/build-benchmark.xml
diff options
context:
space:
mode:
authorlagergren <none@none>2013-05-27 17:57:07 +0200
committerlagergren <none@none>2013-05-27 17:57:07 +0200
commita4fc326bd5ec1eb73f5bc78f6c5bc27d2bfd6d7e (patch)
tree6916f9bc756763e21cbce87c8a86db5aa1821eba /make/build-benchmark.xml
parent6ac1dac5229eca0a32d66dc8b3ca5c9afead3ae9 (diff)
downloadnashorn-a4fc326bd5ec1eb73f5bc78f6c5bc27d2bfd6d7e.tar.gz
8015447: Octane harness fixes for rhino and entire test runs: ant octane, ant octane-v8, ant octane-rhino
Reviewed-by: sundar, jlaskey
Diffstat (limited to 'make/build-benchmark.xml')
-rw-r--r--make/build-benchmark.xml15
1 files changed, 7 insertions, 8 deletions
diff --git a/make/build-benchmark.xml b/make/build-benchmark.xml
index 47064e24..f1ce180a 100644
--- a/make/build-benchmark.xml
+++ b/make/build-benchmark.xml
@@ -24,14 +24,13 @@
<project name="nashorn-benchmarks" default="all" basedir="..">
<target name="octane-init" depends="jar">
- <fileset id="octane-set"
- dir="${octane-test-sys-prop.test.js.roots}"
- excludes="${octane-test-sys-prop.test.js.exclude.list}">
- <include name="*.js"/>
- </fileset>
- <pathconvert pathsep=" " property="octane-tests" refid="octane-set"/>
+ <property name="octane-tests" value="box2d code-load crypto deltablue earley-boyer gbemu navier-stokes pdfjs raytrace regexp richards splay"/>
+ </target>
+
+ <!-- ignore benchmarks where rhino crashes -->
+ <target name="octane-init-rhino" depends="jar">
+ <property name="octane-tests" value="box2d code-load crypto deltablue earley-boyer gbemu navier-stokes raytrace regexp richards splay"/>
</target>
-
<!-- box2d -->
<target name="octane-box2d" depends="jar">
@@ -320,7 +319,7 @@
</target>
<!-- run octane benchmarks using Rhino as runtime -->
- <target name="octane-rhino" depends="octane-init">
+ <target name="octane-rhino" depends="octane-init-rhino">
<antcall target="run-octane-rhino"/>
</target>