Fri, 28 Mar 2014 13:24:07 +0530
8038615: test262 repo is now a git repo in github
Reviewed-by: lagergren, hannesw
README | file | annotate | diff | comparison | revisions | |
make/build.xml | file | annotate | diff | comparison | revisions |
1.1 --- a/README Thu Mar 27 19:39:18 2014 +0530 1.2 +++ b/README Fri Mar 28 13:24:07 2014 +0530 1.3 @@ -81,13 +81,13 @@ 1.4 1.5 After that, you can run the tests using: 1.6 cd make 1.7 - ant test 1.8 + ant clean test 1.9 1.10 You can also run the ECMA-262 test suite with Nashorn. In order to do 1.11 that, you will need to get a copy of it and put it in 1.12 test/script/external/test262 directory. A convenient way to do it is: 1.13 1.14 - hg clone http://hg.ecmascript.org/tests/test262/ test/script/external/test262 1.15 + git clone https://github.com/tc39/test262 test/script/external/test262 1.16 1.17 Alternatively, you can check it out elsewhere and make 1.18 test/script/external/test262 a symbolic link to that directory. After 1.19 @@ -95,6 +95,11 @@ 1.20 1.21 cd nashorn~jdk8/nashorn/make 1.22 ant test262 1.23 + 1.24 +Ant target to get/update external test suites: 1.25 + 1.26 + ant externals 1.27 + ant update-externals 1.28 1.29 These tests take time, so we have a parallelized runner for them that 1.30 takes advantage of all processor cores on the computer:
2.1 --- a/make/build.xml Thu Mar 27 19:39:18 2014 +0530 2.2 +++ b/make/build.xml Fri Mar 28 13:24:07 2014 +0530 2.3 @@ -42,6 +42,9 @@ 2.4 <condition property="hg.executable" value="/usr/local/bin/hg" else="hg"> 2.5 <available file="/usr/local/bin/hg"/> 2.6 </condition> 2.7 + <condition property="git.executable" value="/usr/local/bin/git" else="git"> 2.8 + <available file="/usr/local/bin/git"/> 2.9 + </condition> 2.10 <!-- check if JDK already has ASM classes --> 2.11 <available property="asm.available" classname="jdk.internal.org.objectweb.asm.Type"/> 2.12 <!-- check if testng.jar is avaiable --> 2.13 @@ -470,18 +473,17 @@ 2.14 2.15 <!-- test262 test suite --> 2.16 <target name="get-test262" depends="init" unless="${test-sys-prop.external.test262}"> 2.17 - <!-- clone test262 mercurial repo --> 2.18 - <exec executable="${hg.executable}"> 2.19 + <!-- clone test262 git repo --> 2.20 + <exec executable="${git.executable}"> 2.21 <arg value="clone"/> 2.22 - <arg value="http://hg.ecmascript.org/tests/test262"/> 2.23 + <arg value="https://github.com/tc39/test262"/> 2.24 <arg value="${test.external.dir}/test262"/> 2.25 </exec> 2.26 </target> 2.27 <target name="update-test262" depends="init" if="${test-sys-prop.external.test262}"> 2.28 - <!-- update test262 mercurial repo --> 2.29 - <exec executable="${hg.executable}" dir="${test.external.dir}/test262"> 2.30 + <!-- update test262 git repo --> 2.31 + <exec executable="${git.executable}" dir="${test.external.dir}/test262"> 2.32 <arg value="pull"/> 2.33 - <arg value="-u"/> 2.34 </exec> 2.35 </target> 2.36