changeset 16165:4391faad6957

8005987: ant octane tries to run non-benchmark scripts Reviewed-by: lagergren, attila, jlaskey
author sundar
date Thu, 10 Jan 2013 19:03:25 +0530
parents 1899aada11f8
children b30784442c47
files nashorn/make/build-benchmark.xml nashorn/make/project.properties
diffstat 2 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/nashorn/make/build-benchmark.xml	Thu Jan 10 10:28:57 2013 +0100
+++ b/nashorn/make/build-benchmark.xml	Thu Jan 10 19:03:25 2013 +0530
@@ -27,7 +27,7 @@
     <fileset id="octane-set"
 	     dir="${octane-test-sys-prop.test.js.roots}"
 	     excludes="${octane-test-sys-prop.test.js.exclude.list}">
-      <include name="**/*.js"/>
+      <include name="*.js"/>
     </fileset>
     <pathconvert pathsep=" " property="octane-tests" refid="octane-set"/>
     <property name="extra-arg" value=""/>
--- a/nashorn/make/project.properties	Thu Jan 10 10:28:57 2013 +0100
+++ b/nashorn/make/project.properties	Thu Jan 10 19:03:25 2013 +0530
@@ -160,7 +160,9 @@
 octane-test-sys-prop.test.js.framework=${test.basic.dir}/run-octane.js
 
 # list of tests to be excluded
-octane-test-sys-prop.test.js.exclude.list=base.js
+octane-test-sys-prop.test.js.exclude.list=\
+    base.js \
+    run.js
 
 # test root for sunspider
 sunspider-test-sys-prop.test.js.roots=${test.external.dir}/sunspider/tests/sunspider-1.0/