Bug 496923 - Update update-test262.sh to make the test262/intl402 tests work again. r=terrence

--HG--
extra : rebase_source : 9951491bd7e0c50f0581e096a7efb63881e59626
This commit is contained in:
Jeff Walden 2013-07-02 18:41:23 -07:00
parent 7dcdd2a789
commit 2fd31b4800
2 changed files with 7 additions and 10 deletions

View File

@ -22,11 +22,3 @@ setRestoreFunction((function () {
Array.prototype.sort = Array_sort;
};
}()));
/*
* Loading include files into the browser from a script so that they become
* synchronously available to that same script is difficult. Instead, request
* all of them to be loaded before we start.
*/
include("supporting/testBuiltInObject.js");
include("supporting/testIntl.js");

View File

@ -114,8 +114,13 @@ done
cp ${js_src_tests_dir}/supporting/test262-browser.js ${test262_dir}/browser.js
cat ${js_src_tests_dir}/supporting/sta.js ${js_src_tests_dir}/supporting/test262-shell.js > ${test262_dir}/shell.js
# Restore the Intl tests' jstests adapter files.
cp ${js_src_tests_dir}/supporting/test402-browser.js ${test262_dir}/intl402/browser.js
# Restore the Intl tests' jstests adapter files. Loading include files into the
# browser from a script so that they become synchronously available to that same
# script is basically impossible. Instead, just concatenate all the scripts
# together into one script loaded before the test executes.
cat ${js_src_tests_dir}/supporting/test402-browser.js \
${js_src_tests_dir}/supporting/testBuiltInObject.js \
${js_src_tests_dir}/supporting/testIntl.js > ${test262_dir}/intl402/browser.js
cp ${js_src_tests_dir}/supporting/test402-shell.js ${test262_dir}/intl402/shell.js
# Keep a record of what we imported.