Bug 1530879 - Update the test262 import to upstream rev 116c95d97ce3982c45d955ab596c7b55efd51a8f. r=jorendorff
authorJeff Walden <jwalden@mit.edu>
Tue, 26 Feb 2019 17:06:48 -0800
changeset 519543 075e7b0295529f13de5cdb3443cc1f045b9ba994
parent 519542 d43af7026a45a55f27d0592a4571cdd49ca02e68
child 519544 a088ba848e63ca2e6834633eef455166349ad72e
push id10862
push userffxbld-merge
push dateMon, 11 Mar 2019 13:01:11 +0000
treeherdermozilla-beta@a2e7f5c935da [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjorendorff
bugs1530879
milestone67.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1530879 - Update the test262 import to upstream rev 116c95d97ce3982c45d955ab596c7b55efd51a8f. r=jorendorff
js/src/tests/jstests.list
js/src/tests/test262/GIT-INFO
js/src/tests/test262/intl402/Collator/missing-unicode-ext-value-defaults-to-true.js
--- a/js/src/tests/jstests.list
+++ b/js/src/tests/jstests.list
@@ -1234,16 +1234,20 @@ skip script test262/built-ins/RegExp/pro
 skip script test262/built-ins/RegExp/prototype/sticky/cross-realm.js
 skip script test262/built-ins/RegExp/prototype/ignoreCase/cross-realm.js
 skip script test262/built-ins/RegExp/prototype/unicode/cross-realm.js
 skip script test262/built-ins/RegExp/prototype/source/cross-realm.js
 
 # https://bugzilla.mozilla.org/show_bug.cgi?id=1508684
 skip script test262/language/expressions/import.meta/syntax/invalid-assignment-target-update-expr.js
 
+# https://github.com/tc39/test262/pull/1995 seemingly needs SpiderMonkey changes
+# before we can run the updated test -- bug 1531091.
+skip script test262/intl402/Collator/missing-unicode-ext-value-defaults-to-true.js
+
 ###########################################################
 # Tests disabled due to issues in test262 importer script #
 ###########################################################
 
 # test262 importer merges all includes in a per directory shell.js file, breaking this harness test case.
 skip script test262/harness/detachArrayBuffer.js
 
 
--- a/js/src/tests/test262/GIT-INFO
+++ b/js/src/tests/test262/GIT-INFO
@@ -1,5 +1,9 @@
-commit b7c9c6c78b65f63df93650c11476225f38bcd1fa
+commit 116c95d97ce3982c45d955ab596c7b55efd51a8f
 Author: Frank Yung-Fong Tang <41213225+FrankYFTang@users.noreply.github.com>
-Date:   Thu Jan 24 09:34:03 2019 -0800
+Date:   Thu Jan 24 09:45:49 2019 -0800
 
-    Remove unsupported irregular grandfathered tags. (#2029)
+    Change test for -kn (#1995)
+    
+    Add test for case of -kn-true
+    Verify no -kn-true nor -kn-false in the returned locale.
+    Change expectation per https://github.com/tc39/ecma402/pull/302
--- a/js/src/tests/test262/intl402/Collator/missing-unicode-ext-value-defaults-to-true.js
+++ b/js/src/tests/test262/intl402/Collator/missing-unicode-ext-value-defaults-to-true.js
@@ -5,21 +5,23 @@
 /*---
 es5id: 9.2.5_11_g_ii_2
 description: >
     Tests that missing Unicode extension values default to true for
     boolean keys.
 author: Norbert Lindenberg
 ---*/
 
-var extensions = ["-u-co-phonebk-kn", "-u-kn-co-phonebk"];
+var extensions = ["-u-co-phonebk-kn", "-u-kn-co-phonebk", "-u-co-phonebk-kn-true", "-u-kn-true-co-phonebk"];
 extensions.forEach(function (extension) {
     var defaultLocale = new Intl.Collator().resolvedOptions().locale;
     var collator = new Intl.Collator([defaultLocale + extension], {usage: "sort"});
     var locale = collator.resolvedOptions().locale;
     var numeric = collator.resolvedOptions().numeric;
     if (numeric !== undefined) {
         assert.sameValue(numeric, true, "Default value for \"kn\" should be true, but is " + numeric + ".");
-        assert.sameValue(locale.indexOf("-kn"), -1, "\"kn\" is returned in locale, but shouldn't be.");
+        assert.sameValue(locale.indexOf("-kn-false"), -1, "\"kn-false\" is returned in locale, but shouldn't be.");
+        assert.sameValue(locale.indexOf("-kn-true"), -1, "\"kn-true\" is returned in locale, but shouldn't be.");
+        assert.sameValue(locale.indexOf("-kn") >= 0, true, "\"kn\" should be returned in locale.");
     }
 });
 
 reportCompare(0, 0);