aboutsummaryrefslogtreecommitdiff
path: root/make
diff options
context:
space:
mode:
authorlagergren <none@none>2013-12-11 18:09:34 +0100
committerlagergren <none@none>2013-12-11 18:09:34 +0100
commit9bed2a8049411badecef53c2d747dda02e05e209 (patch)
tree68601eb30220d024584bbd5af6f177960ad48278 /make
parent938f3496c1d8c8298467a36f698a7d7f6350bc7f (diff)
downloadnashorn-9bed2a8049411badecef53c2d747dda02e05e209.tar.gz
8029780: "ant externals" broke our test harness with the latest version of the octane benchmarks
Reviewed-by: attila, sundar
Diffstat (limited to 'make')
-rw-r--r--make/build-benchmark.xml47
1 files changed, 43 insertions, 4 deletions
diff --git a/make/build-benchmark.xml b/make/build-benchmark.xml
index 8f2296b0..ac87fc12 100644
--- a/make/build-benchmark.xml
+++ b/make/build-benchmark.xml
@@ -239,7 +239,7 @@
</antcall>
</target>
- <target name="octane-regexp-octane-v8" depends="jar">
+ <target name="octane-regexp-v8" depends="jar">
<antcall target="run-octane-v8">
<param name="octane-tests" value="regexp"/>
</antcall>
@@ -291,17 +291,56 @@
</antcall>
</target>
+ <!-- splay -->
+ <target name="octane-typescript" depends="jar">
+ <antcall target="run-octane">
+ <param name="octane-tests" value="typescript"/>
+ </antcall>
+ </target>
+
+ <target name="octane-typescript-v8" depends="jar">
+ <antcall target="run-octane-v8">
+ <param name="octane-typescript" value="typescript"/>
+ </antcall>
+ </target>
+
+ <target name="octane-typescript-rhino" depends="jar">
+ <antcall target="run-octane-rhino">
+ <param name="octane-tests" value="typescript"/>
+ </antcall>
+ </target>
+
+ <!-- zlib -->
+ <target name="octane-zlib" depends="jar">
+ <antcall target="run-octane">
+ <param name="octane-tests" value="zlib"/>
+ </antcall>
+ </target>
+
+ <target name="octane-zlib-v8" depends="jar">
+ <antcall target="run-octane-v8">
+ <param name="octane-typescript" value="zlib"/>
+ </antcall>
+ </target>
+
+ <target name="octane-zlib-rhino" depends="jar">
+ <antcall target="run-octane-rhino">
+ <param name="octane-tests" value="zlib"/>
+ </antcall>
+ </target>
+
<!-- run octane benchmarks in a single process -->
<target name="octane-single-process" depends="octane-init">
<antcall target="run-octane"/>
</target>
- <!-- mandreel excluded due to OOM -->
+ <!-- zlib excluded due to missing implementation of 'read' -->
<target name="octane-separate-process" depends=
"octane-box2d, octane-code-load, octane-crypto,
octane-deltablue, octane-earley-boyer, octane-gbemu,
- octane-navier-stokes, octane-pdfjs, octane-raytrace,
- octane-regexp, octane-richards, octane-splay"/>
+ octane-mandreel, octane-navier-stokes, octane-pdfjs,
+ octane-raytrace, octane-regexp, octane-richards,
+ octane-splay, octane-typescript"/>
<target name="--single-process" unless="${octane-test-sys-prop.separate.process}">
<antcall target="octane-single-process"/>