Skip to content

Commit 88a15f5

Browse files
hnshns
committed
Merge remote-tracking branch 'anba/automated-tests'
2 parents 06e155e + 67962a9 commit 88a15f5

File tree

7 files changed

+31
-36
lines changed

7 files changed

+31
-36
lines changed

‎build.xml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -240,6 +240,12 @@
240240
</javadoc>
241241
</target>
242242

243+
<!--
244+
Compiles and tests all sources and then creates the distribution file
245+
-->
246+
<target name="all" depends="deepclean,compile-all,junit-all,dist">
247+
</target>
248+
243249
<target name="dist" depends="deepclean,jar,retrojar,copy-all,javadoc">
244250
<delete file="${dist.file}" />
245251
<zip destfile="${dist.file}">

‎testsrc/build.xml‎

Lines changed: 23 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,23 @@
33
<!--
44
Location of mozilla/js/tests directory
55
-->
6-
<property name="test.library.dir" location="../tests" />
6+
<property name="test.library.dir" location="${build.dir}/tests" />
77
<property name="test.jstests.jar" location="${test.library.dir}/src/jstests.jar" />
88

99
<!--
1010
URL from which junit.jar can be retrieved
1111
-->
12-
<property name="test.junit.url" value="http://mirrors.ibiblio.org/pub/mirrors/maven2/junit/junit/4.5/junit-4.5.jar"/>
12+
<property name="test.junit.url" value="http://mirrors.ibiblio.org/pub/mirrors/maven2/junit/junit/4.10/junit-4.10.jar"/>
13+
14+
<!--
15+
URL from which emma.jar can be retrieved
16+
-->
17+
<property name="test.emma.url" value="http://mirrors.ibiblio.org/pub/mirrors/maven2/emma/emma/2.1.5320/emma-2.1.5320.jar"/>
18+
19+
<!--
20+
URL from which emma_ant.jar can be retrieved
21+
-->
22+
<property name="test.emma_ant.url" value="http://mirrors.ibiblio.org/pub/mirrors/maven2/emma/emma_ant/2.1.5320/emma_ant-2.1.5320.jar"/>
1323

1424
<!--
1525
Destination to which testing classes should be built
@@ -32,13 +42,13 @@
3242
<property name="test.vm.mx" value="256m" />
3343

3444
<target name="get-junit">
35-
<mkdir dir="lib"/>
36-
<get src="${test.junit.url}" dest="lib/junit.jar" usetimestamp="true"/>
45+
<mkdir dir="lib"/>
46+
<get src="${test.junit.url}" dest="lib/junit.jar" usetimestamp="true" skipexisting="true"/>
3747
</target>
3848

3949
<target name="junit-compile">
4050
<mkdir dir="${test.classes}" />
41-
<antcall target="get-junit"/>
51+
<antcall target="get-junit"/>
4252
<javac
4353
destdir="${test.classes}" debug="true"
4454
target="${target-jvm}"
@@ -79,15 +89,17 @@
7989
<exclude name="**/*.java build.xml"/>
8090
</fileset>
8191
</copy>
92+
<gunzip src="testsrc/tests.tar.gz" dest="${build.dir}/tests.tar"/>
93+
<untar src="${build.dir}/tests.tar" dest="build"/>
8294
</target>
8395

8496
<target name="clean">
8597
<delete dir="${test.classes}" />
8698
</target>
8799

88100
<target name="coverage-instrument">
89-
<get src="http://mirrors.ibiblio.org/pub/mirrors/maven2/emma/emma/2.0.5312/emma-2.0.5312.jar" dest="lib/emma.jar" usetimestamp="true"/>
90-
<get src="http://mirrors.ibiblio.org/pub/mirrors/maven2/emma/emma_ant/2.0.5312/emma_ant-2.0.5312.jar" dest="lib/emma_ant.jar" usetimestamp="true"/>
101+
<get src="${test.emma.url}" dest="lib/emma.jar" usetimestamp="true" skipexisting="true"/>
102+
<get src="${test.emma_ant.url}" dest="lib/emma_ant.jar" usetimestamp="true" skipexisting="true"/>
91103
<property name="coverage.dir" location="${build.dir}/coverage"/>
92104
<property name="coverage.classes.dir" location="${build.dir}/coverage/classes"/>
93105
<mkdir dir="${coverage.classes.dir}"/>
@@ -118,6 +130,10 @@
118130
<sysproperty key="mozilla.js.tests" value="${test.library.dir}" />
119131
<sysproperty key="mozilla.js.tests.timeout" value="${test.timeout}" />
120132
<sysproperty key="emma.coverage.out.file" value="${coverage.outfile}"/>
133+
<!-- mozilla test cases are locale dependent! -->
134+
<sysproperty key="user.language" value="en"/>
135+
<sysproperty key="user.country" value="US"/>
136+
<sysproperty key="user.timezone" value="America/Los_Angeles"/>
121137
<classpath>
122138
<pathelement location="${xbean.jar}"/>
123139
<pathelement location="${jsr173.jar}"/>

‎testsrc/opt-1.tests‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -940,7 +940,6 @@ ecma_3/RegExp/perlstress-001.js
940940
ecma_3/RegExp/perlstress-002.js
941941
ecma_3/RegExp/regress-100199.js
942942
ecma_3/RegExp/regress-105972.js
943-
ecma_3/RegExp/regress-119909.js
944943
ecma_3/RegExp/regress-122076.js
945944
ecma_3/RegExp/regress-123437.js
946945
ecma_3/RegExp/regress-165353.js
@@ -1325,7 +1324,6 @@ js1_5/Regress/regress-80981.js
13251324
js1_5/Regress/regress-82306.js
13261325
js1_5/Regress/regress-90445.js
13271326
js1_5/Regress/regress-96526-001.js
1328-
js1_5/Regress/regress-96526-003.js
13291327
js1_5/Scope/regress-154693.js
13301328
js1_5/Scope/regress-184107.js
13311329
js1_5/Scope/regress-185485.js
@@ -1342,15 +1340,13 @@ js1_5/Scope/scope-003.js
13421340
js1_5/String/regress-107771.js
13431341
js1_5/String/regress-112626.js
13441342
js1_5/String/regress-179068.js
1345-
js1_5/String/regress-314890.js
13461343
js1_5/decompilation/regress-344120.js
13471344
js1_5/decompilation/regress-349489.js
13481345
js1_5/decompilation/regress-349663.js
13491346
js1_5/decompilation/regress-350670.js
13501347
js1_5/decompilation/regress-351625.js
13511348
js1_5/decompilation/regress-351626.js
13521349
js1_5/decompilation/regress-352022.js
1353-
js1_5/decompilation/regress-352073.js
13541350
js1_5/decompilation/regress-352360.js
13551351
js1_5/decompilation/regress-352873-01.js
13561352
js1_5/decompilation/regress-352873-02.js
@@ -1374,7 +1370,6 @@ js1_5/extensions/regress-178722.js
13741370
js1_5/extensions/regress-220584.js
13751371
js1_5/extensions/regress-225831.js
13761372
js1_5/extensions/regress-226078.js
1377-
js1_5/extensions/regress-226507.js
13781373
js1_5/extensions/regress-237461.js
13791374
js1_5/extensions/regress-245795.js
13801375
js1_5/extensions/regress-255245.js

‎testsrc/opt0.tests‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -941,7 +941,6 @@ ecma_3/RegExp/perlstress-001.js
941941
ecma_3/RegExp/perlstress-002.js
942942
ecma_3/RegExp/regress-100199.js
943943
ecma_3/RegExp/regress-105972.js
944-
ecma_3/RegExp/regress-119909.js
945944
ecma_3/RegExp/regress-122076.js
946945
ecma_3/RegExp/regress-123437.js
947946
ecma_3/RegExp/regress-165353.js
@@ -983,11 +982,7 @@ ecma_3/Statements/regress-131348.js
983982
ecma_3/Statements/regress-157509.js
984983
ecma_3/Statements/regress-194364.js
985984
ecma_3/Statements/regress-226517.js
986-
ecma_3/Statements/regress-302439.js
987-
ecma_3/Statements/regress-324650.js
988985
ecma_3/Statements/regress-74474-001.js
989-
ecma_3/Statements/regress-74474-002.js
990-
ecma_3/Statements/regress-74474-003.js
991986
ecma_3/Statements/regress-83532-001.js
992987
ecma_3/Statements/regress-83532-002.js
993988
ecma_3/Statements/switch-001.js
@@ -1177,7 +1172,6 @@ js1_5/Object/regress-382532.js
11771172
js1_5/Object/regress-90596-003.js
11781173
js1_5/Regress/regress-104077.js
11791174
js1_5/Regress/regress-110286.js
1180-
js1_5/Regress/regress-111557.js
11811175
js1_5/Regress/regress-114491.js
11821176
js1_5/Regress/regress-114493.js
11831177
js1_5/Regress/regress-115436.js
@@ -1221,7 +1215,6 @@ js1_5/Regress/regress-238945.js
12211215
js1_5/Regress/regress-243174.js
12221216
js1_5/Regress/regress-243389-n.js
12231217
js1_5/Regress/regress-243869.js
1224-
js1_5/Regress/regress-244470.js
12251218
js1_5/Regress/regress-244619.js
12261219
js1_5/Regress/regress-245113.js
12271220
js1_5/Regress/regress-245308.js
@@ -1317,11 +1310,9 @@ js1_5/Regress/regress-68498-004.js
13171310
js1_5/Regress/regress-69607.js
13181311
js1_5/Regress/regress-71107.js
13191312
js1_5/Regress/regress-76054.js
1320-
js1_5/Regress/regress-80981.js
13211313
js1_5/Regress/regress-82306.js
13221314
js1_5/Regress/regress-90445.js
13231315
js1_5/Regress/regress-96526-001.js
1324-
js1_5/Regress/regress-96526-003.js
13251316
js1_5/Scope/regress-154693.js
13261317
js1_5/Scope/regress-184107.js
13271318
js1_5/Scope/regress-185485.js
@@ -1338,15 +1329,13 @@ js1_5/Scope/scope-003.js
13381329
js1_5/String/regress-107771.js
13391330
js1_5/String/regress-112626.js
13401331
js1_5/String/regress-179068.js
1341-
js1_5/String/regress-314890.js
13421332
js1_5/decompilation/regress-344120.js
13431333
js1_5/decompilation/regress-349489.js
13441334
js1_5/decompilation/regress-349663.js
13451335
js1_5/decompilation/regress-350670.js
13461336
js1_5/decompilation/regress-351625.js
13471337
js1_5/decompilation/regress-351626.js
13481338
js1_5/decompilation/regress-352022.js
1349-
js1_5/decompilation/regress-352073.js
13501339
js1_5/decompilation/regress-352360.js
13511340
js1_5/decompilation/regress-352873-01.js
13521341
js1_5/decompilation/regress-352873-02.js

‎testsrc/opt9.tests‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -941,7 +941,6 @@ ecma_3/RegExp/perlstress-001.js
941941
ecma_3/RegExp/perlstress-002.js
942942
ecma_3/RegExp/regress-100199.js
943943
ecma_3/RegExp/regress-105972.js
944-
ecma_3/RegExp/regress-119909.js
945944
ecma_3/RegExp/regress-122076.js
946945
ecma_3/RegExp/regress-123437.js
947946
ecma_3/RegExp/regress-165353.js
@@ -983,11 +982,7 @@ ecma_3/Statements/regress-131348.js
983982
ecma_3/Statements/regress-157509.js
984983
ecma_3/Statements/regress-194364.js
985984
ecma_3/Statements/regress-226517.js
986-
ecma_3/Statements/regress-302439.js
987-
ecma_3/Statements/regress-324650.js
988985
ecma_3/Statements/regress-74474-001.js
989-
ecma_3/Statements/regress-74474-002.js
990-
ecma_3/Statements/regress-74474-003.js
991986
ecma_3/Statements/regress-83532-001.js
992987
ecma_3/Statements/regress-83532-002.js
993988
ecma_3/Statements/switch-001.js
@@ -1177,7 +1172,6 @@ js1_5/Object/regress-382532.js
11771172
js1_5/Object/regress-90596-003.js
11781173
js1_5/Regress/regress-104077.js
11791174
js1_5/Regress/regress-110286.js
1180-
js1_5/Regress/regress-111557.js
11811175
js1_5/Regress/regress-114491.js
11821176
js1_5/Regress/regress-114493.js
11831177
js1_5/Regress/regress-115436.js
@@ -1221,7 +1215,6 @@ js1_5/Regress/regress-238945.js
12211215
js1_5/Regress/regress-243174.js
12221216
js1_5/Regress/regress-243389-n.js
12231217
js1_5/Regress/regress-243869.js
1224-
js1_5/Regress/regress-244470.js
12251218
js1_5/Regress/regress-244619.js
12261219
js1_5/Regress/regress-245113.js
12271220
js1_5/Regress/regress-245308.js
@@ -1317,11 +1310,9 @@ js1_5/Regress/regress-68498-004.js
13171310
js1_5/Regress/regress-69607.js
13181311
js1_5/Regress/regress-71107.js
13191312
js1_5/Regress/regress-76054.js
1320-
js1_5/Regress/regress-80981.js
13211313
js1_5/Regress/regress-82306.js
13221314
js1_5/Regress/regress-90445.js
13231315
js1_5/Regress/regress-96526-001.js
1324-
js1_5/Regress/regress-96526-003.js
13251316
js1_5/Scope/regress-154693.js
13261317
js1_5/Scope/regress-184107.js
13271318
js1_5/Scope/regress-185485.js
@@ -1338,15 +1329,13 @@ js1_5/Scope/scope-003.js
13381329
js1_5/String/regress-107771.js
13391330
js1_5/String/regress-112626.js
13401331
js1_5/String/regress-179068.js
1341-
js1_5/String/regress-314890.js
13421332
js1_5/decompilation/regress-344120.js
13431333
js1_5/decompilation/regress-349489.js
13441334
js1_5/decompilation/regress-349663.js
13451335
js1_5/decompilation/regress-350670.js
13461336
js1_5/decompilation/regress-351625.js
13471337
js1_5/decompilation/regress-351626.js
13481338
js1_5/decompilation/regress-352022.js
1349-
js1_5/decompilation/regress-352073.js
13501339
js1_5/decompilation/regress-352360.js
13511340
js1_5/decompilation/regress-352873-01.js
13521341
js1_5/decompilation/regress-352873-02.js

‎testsrc/org/mozilla/javascript/tests/commonjs/module/ComplianceTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,8 @@ private static Require createRequire(File dir, Context cx, Scriptable scope)
7676
throws URISyntaxException
7777
{
7878
return new Require(cx, scope, new StrongCachingModuleScriptProvider(
79-
new UrlModuleSourceProvider(Collections.singleton(new URI(
80-
"file:" + dir.getAbsolutePath().replace(File.separatorChar,'/') + "/")),
79+
new UrlModuleSourceProvider(
80+
Collections.singleton(dir.getAbsoluteFile().toURI()),
8181
Collections.singleton(new URI(ComplianceTest.class.getResource(".").toExternalForm() + "/")))),
8282
null, null, false);
8383
}

‎testsrc/tests.tar.gz‎

1.68 MB
Binary file not shown.

0 commit comments

Comments
 (0)