# HG changeset patch
# User sundar
# Date 1357750960 -19800
# Node ID 4cd65798ec7002f2792640947e0bf31c0a0ef9a6
# Parent 812b9963b1c7a0187923c856e059bcbe865e2bb5
8005940: provide ant targets to get and update external test scripts
Reviewed-by: jlaskey, lagergren
diff -r 812b9963b1c7 -r 4cd65798ec70 bin/verbose_octane.bat
--- a/bin/verbose_octane.bat Wed Jan 09 15:02:48 2013 +0100
+++ b/bin/verbose_octane.bat Wed Jan 09 22:32:40 2013 +0530
@@ -44,16 +44,16 @@
set CMD=%1 %JVM_FLAGS%
)
-%CMD% test/script/basic/run-octane.js -- test/script/external/octane/benchmarks/box2d.js %OCTANE_ARGS%
-%CMD% test/script/basic/run-octane.js -- test/script/external/octane/benchmarks/code-load.js %OCTANE_ARGS%
-%CMD% test/script/basic/run-octane.js -- test/script/external/octane/benchmarks/crypto.js %OCTANE_ARGS%
-%CMD% test/script/basic/run-octane.js -- test/script/external/octane/benchmarks/deltablue.js %OCTANE_ARGS%
-%CMD% test/script/basic/run-octane.js -- test/script/external/octane/benchmarks/gbemu.js %OCTANE_ARGS%
-%CMD% test/script/basic/run-octane.js -- test/script/external/octane/benchmarks/navier-stokes.js %OCTANE_ARGS%
-%CMD% test/script/basic/run-octane.js -- test/script/external/octane/benchmarks/pdfjs.js %OCTANE_ARGS%
-%CMD% test/script/basic/run-octane.js -- test/script/external/octane/benchmarks/raytrace.js %OCTANE_ARGS%
-%CMD% test/script/basic/run-octane.js -- test/script/external/octane/benchmarks/regexp.js %OCTANE_ARGS%
-%CMD% test/script/basic/run-octane.js -- test/script/external/octane/benchmarks/richards.js %OCTANE_ARGS%
-%CMD% test/script/basic/run-octane.js -- test/script/external/octane/benchmarks/splay.js %OCTANE_ARGS%
+%CMD% test/script/basic/run-octane.js -- test/script/external/octane/box2d.js %OCTANE_ARGS%
+%CMD% test/script/basic/run-octane.js -- test/script/external/octane/code-load.js %OCTANE_ARGS%
+%CMD% test/script/basic/run-octane.js -- test/script/external/octane/crypto.js %OCTANE_ARGS%
+%CMD% test/script/basic/run-octane.js -- test/script/external/octane/deltablue.js %OCTANE_ARGS%
+%CMD% test/script/basic/run-octane.js -- test/script/external/octane/gbemu.js %OCTANE_ARGS%
+%CMD% test/script/basic/run-octane.js -- test/script/external/octane/navier-stokes.js %OCTANE_ARGS%
+%CMD% test/script/basic/run-octane.js -- test/script/external/octane/pdfjs.js %OCTANE_ARGS%
+%CMD% test/script/basic/run-octane.js -- test/script/external/octane/raytrace.js %OCTANE_ARGS%
+%CMD% test/script/basic/run-octane.js -- test/script/external/octane/regexp.js %OCTANE_ARGS%
+%CMD% test/script/basic/run-octane.js -- test/script/external/octane/richards.js %OCTANE_ARGS%
+%CMD% test/script/basic/run-octane.js -- test/script/external/octane/splay.js %OCTANE_ARGS%
endlocal
goto :EOF
diff -r 812b9963b1c7 -r 4cd65798ec70 bin/verbose_octane.sh
--- a/bin/verbose_octane.sh Wed Jan 09 15:02:48 2013 +0100
+++ b/bin/verbose_octane.sh Wed Jan 09 22:32:40 2013 +0530
@@ -37,7 +37,7 @@
echo "running ${ITERS} iterations with java7 using JAVA_HOME=${JAVA7_HOME}..."
for BENCHMARK in "${BENCHMARKS[@]}"
do
- CMD="${JAVA8_HOME}/bin/java ${JVM_FLAGS} test/script/basic/run-octane.js -- test/script/external/octane/benchmarks/${BENCHMARK} ${OCTANE_ARGS}"
+ CMD="${JAVA8_HOME}/bin/java ${JVM_FLAGS} test/script/basic/run-octane.js -- test/script/external/octane/${BENCHMARK} ${OCTANE_ARGS}"
$CMD
done
else
@@ -48,7 +48,7 @@
echo "running ${ITERS} iterations with java8 using JAVA_HOME=${JAVA8_HOME}..."
for BENCHMARK in "${BENCHMARKS[@]}"
do
- CMD="${JAVA8_HOME}/bin/java ${JVM_FLAGS} test/script/basic/run-octane.js -- test/script/external/octane/benchmarks/${BENCHMARK} ${OCTANE_ARGS}"
+ CMD="${JAVA8_HOME}/bin/java ${JVM_FLAGS} test/script/basic/run-octane.js -- test/script/external/octane/${BENCHMARK} ${OCTANE_ARGS}"
$CMD
done
else
diff -r 812b9963b1c7 -r 4cd65798ec70 make/Makefile
--- a/make/Makefile Wed Jan 09 15:02:48 2013 +0100
+++ b/make/Makefile Wed Jan 09 22:32:40 2013 +0530
@@ -190,7 +190,7 @@
clobber: clean
# All ant targets of interest
-ANT_TARGETS = clean jar javadoc shelldoc docs test test262 test262parallel # for now
+ANT_TARGETS = clean externals update-externals jar javadoc shelldoc docs test test262 test262parallel # for now
# Create diagnostics log (careful, ant 1.8.0 -diagnostics always does an exit 1)
$(OUTPUTDIR)/build/ant-diagnostics.log:
diff -r 812b9963b1c7 -r 4cd65798ec70 make/build-benchmark.xml
--- a/make/build-benchmark.xml Wed Jan 09 15:02:48 2013 +0100
+++ b/make/build-benchmark.xml Wed Jan 09 22:32:40 2013 +0530
@@ -245,7 +245,6 @@
classpath="${run.test.classpath}"
fork="true"
dir=".">
-
@@ -277,7 +276,6 @@
classpath="${run.test.classpath}"
fork="true"
dir=".">
-
@@ -312,7 +310,6 @@
classpath="${run.test.classpath}"
fork="true"
dir=".">
-
@@ -338,7 +335,6 @@
classpath="${run.test.classpath}"
fork="true"
dir=".">
-
diff -r 812b9963b1c7 -r 4cd65798ec70 make/build.xml
--- a/make/build.xml Wed Jan 09 15:02:48 2013 +0100
+++ b/make/build.xml Wed Jan 09 22:32:40 2013 +0530
@@ -31,6 +31,12 @@
+
+
+
+
+
+
@@ -357,4 +363,93 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff -r 812b9963b1c7 -r 4cd65798ec70 make/project.properties
--- a/make/project.properties Wed Jan 09 15:02:48 2013 +0100
+++ b/make/project.properties Wed Jan 09 22:32:40 2013 +0530
@@ -154,7 +154,7 @@
test-sys-prop.test.js.unchecked.dir=${test262.dir}
# test root for octane
-octane-test-sys-prop.test.js.roots=${test.external.dir}/octane/benchmarks
+octane-test-sys-prop.test.js.roots=${test.external.dir}/octane/
# framework root for octane
octane-test-sys-prop.test.js.framework=${test.basic.dir}/run-octane.js
@@ -163,7 +163,7 @@
octane-test-sys-prop.test.js.exclude.list=base.js
# test root for sunspider
-sunspider-test-sys-prop.test.js.roots=${test.external.dir}/sunspider/
+sunspider-test-sys-prop.test.js.roots=${test.external.dir}/sunspider/tests/sunspider-1.0/
# framework root for sunspider
sunspider-test-sys-prop.test.js.framework=${test.basic.dir}/runsunspider.js
diff -r 812b9963b1c7 -r 4cd65798ec70 test/script/basic/run-octane.js
--- a/test/script/basic/run-octane.js Wed Jan 09 15:02:48 2013 +0100
+++ b/test/script/basic/run-octane.js Wed Jan 09 22:32:40 2013 +0530
@@ -52,7 +52,7 @@
var dir = (typeof(__DIR__) == 'undefined') ? "test/script/basic/" : __DIR__;
// TODO: why is this path hard coded when it's defined in project properties?
-var path = dir + "../external/octane/benchmarks/";
+var path = dir + "../external/octane/";
var runtime = "";
var verbose = false;
diff -r 812b9963b1c7 -r 4cd65798ec70 test/script/basic/runsunspider.js
--- a/test/script/basic/runsunspider.js Wed Jan 09 15:02:48 2013 +0100
+++ b/test/script/basic/runsunspider.js Wed Jan 09 22:32:40 2013 +0530
@@ -121,30 +121,29 @@
}
var tests = [
- 'check-3d-cube.js',
- 'check-access-nsieve.js',
- 'check-crypto-aes.js',
- 'check-math-spectral-norm.js',
- 'check-3d-morph.js',
- 'check-bitops-3bit-bits-in-byte.js',
- 'check-crypto-md5.js',
- 'check-mont.js',
- 'check-3d-raytrace.js',
- 'check-bitops-bits-in-byte.js',
- 'check-crypto-sha1.js',
- 'check-regexp-dna.js',
- 'check-access-binary-trees.js',
- 'check-bitops-bitwise-and.js',
- 'check-date-format-tofte.js',
- 'check-string-fasta.js',
- 'check-access-fannkuch.js',
- 'check-bitops-nsieve-bits.js',
- 'check-math-cordic.js',
- 'check-string-tagcloud.js',
- 'check-access-nbody.js',
- 'check-controlflow-recursive.js',
- 'check-math-partial-sums.js',
- 'check-string-unpack-code.js'
+ '3d-cube.js',
+ 'access-nsieve.js',
+ 'crypto-aes.js',
+ 'math-spectral-norm.js',
+ '3d-morph.js',
+ 'bitops-3bit-bits-in-byte.js',
+ 'crypto-md5.js',
+ '3d-raytrace.js',
+ 'bitops-bits-in-byte.js',
+ 'crypto-sha1.js',
+ 'regexp-dna.js',
+ 'access-binary-trees.js',
+ 'bitops-bitwise-and.js',
+ 'date-format-tofte.js',
+ 'string-fasta.js',
+ 'access-fannkuch.js',
+ 'bitops-nsieve-bits.js',
+ 'math-cordic.js',
+ 'string-tagcloud.js',
+ 'access-nbody.js',
+ 'controlflow-recursive.js',
+ 'math-partial-sums.js',
+ 'string-unpack-code.js'
];
// handle the case this script may be run by a JS engine that doesn't
@@ -152,7 +151,7 @@
var dir = (typeof(__DIR__) == 'undefined')? "test/script/basic/" : __DIR__;
for (i in tests) {
- tests[i] = dir + '../external/sunspider/' + tests[i];
+ tests[i] = dir + '../external/sunspider/tests/sunspider-1.0/' + tests[i];
}
var verbose_run = false;
diff -r 812b9963b1c7 -r 4cd65798ec70 test/src/jdk/nashorn/internal/codegen/CompilerTest.java
--- a/test/src/jdk/nashorn/internal/codegen/CompilerTest.java Wed Jan 09 15:02:48 2013 +0100
+++ b/test/src/jdk/nashorn/internal/codegen/CompilerTest.java Wed Jan 09 22:32:40 2013 +0530
@@ -43,8 +43,6 @@
public class CompilerTest {
private static final boolean VERBOSE = Boolean.valueOf(System.getProperty("compilertest.verbose"));
private static final boolean TEST262 = Boolean.valueOf(System.getProperty("compilertest.test262"));
-
- private static final String ES5CONFORM_DIR = System.getProperty("es5conform.testcases.dir");
private static final String TEST_BASIC_DIR = System.getProperty("test.basic.dir");
private static final String TEST262_SUITE_DIR = System.getProperty("test262.suite.dir");
@@ -90,7 +88,6 @@
}
});
}
- compileTestSet(ES5CONFORM_DIR, null);
compileTestSet(TEST_BASIC_DIR, null);
}
diff -r 812b9963b1c7 -r 4cd65798ec70 test/src/jdk/nashorn/internal/parser/ParserTest.java
--- a/test/src/jdk/nashorn/internal/parser/ParserTest.java Wed Jan 09 15:02:48 2013 +0100
+++ b/test/src/jdk/nashorn/internal/parser/ParserTest.java Wed Jan 09 22:32:40 2013 +0530
@@ -43,7 +43,6 @@
private static final boolean VERBOSE = Boolean.valueOf(System.getProperty("parsertest.verbose"));
private static final boolean TEST262 = Boolean.valueOf(System.getProperty("parsertest.test262"));
- private static final String ES5CONFORM_DIR = System.getProperty("es5conform.testcases.dir");
private static final String TEST_BASIC_DIR = System.getProperty("test.basic.dir");
private static final String TEST262_SUITE_DIR = System.getProperty("test262.suite.dir");
@@ -80,7 +79,6 @@
}
});
}
- parseTestSet(ES5CONFORM_DIR, null);
parseTestSet(TEST_BASIC_DIR, null);
}