From bf23b5f90741cc61f78b51f606362ff466c501ec Mon Sep 17 00:00:00 2001 From: Jan de Mooij Date: Thu, 29 Apr 2021 13:58:14 +0000 Subject: [PATCH] Bug 1708160 - Move non262/Set/ tests to jit-tests. r=sfink Differential Revision: https://phabricator.services.mozilla.com/D113646 --- .../tests}/Set/NaN-as-key.js | 20 ++----------------- .../tests}/Set/forEach-selfhosted-behavior.js | 17 +--------------- js/src/jit-test/tests/Set/getter-name.js | 3 +++ .../tests}/Set/iterator-thisv-error.js | 3 --- .../tests}/Set/non-iterable-error.js | 3 --- .../non262 => jit-test/tests}/Set/symbols.js | 5 ++--- js/src/tests/non262/Set/browser.js | 0 js/src/tests/non262/Set/getter-name.js | 10 ---------- js/src/tests/non262/Set/shell.js | 0 9 files changed, 8 insertions(+), 53 deletions(-) rename js/src/{tests/non262 => jit-test/tests}/Set/NaN-as-key.js (60%) rename js/src/{tests/non262 => jit-test/tests}/Set/forEach-selfhosted-behavior.js (65%) create mode 100644 js/src/jit-test/tests/Set/getter-name.js rename js/src/{tests/non262 => jit-test/tests}/Set/iterator-thisv-error.js (88%) rename js/src/{tests/non262 => jit-test/tests}/Set/non-iterable-error.js (69%) rename js/src/{tests/non262 => jit-test/tests}/Set/symbols.js (91%) delete mode 100644 js/src/tests/non262/Set/browser.js delete mode 100644 js/src/tests/non262/Set/getter-name.js delete mode 100644 js/src/tests/non262/Set/shell.js diff --git a/js/src/tests/non262/Set/NaN-as-key.js b/js/src/jit-test/tests/Set/NaN-as-key.js similarity index 60% rename from js/src/tests/non262/Set/NaN-as-key.js rename to js/src/jit-test/tests/Set/NaN-as-key.js index 8c9207e8867d..1a24010a83af 100644 --- a/js/src/tests/non262/Set/NaN-as-key.js +++ b/js/src/jit-test/tests/Set/NaN-as-key.js @@ -3,17 +3,9 @@ * http://creativecommons.org/licenses/publicdomain/ */ -//----------------------------------------------------------------------------- -var BUGNUMBER = 722260; -var summary = 'All NaNs must be treated as identical keys for Set'; +// All NaNs must be treated as identical keys for Set. -print(BUGNUMBER + ": " + summary); - -/************** - * BEGIN TEST * - **************/ - -/* Avoid constant-folding that would happen were |undefined| to be used. */ +// Avoid constant-folding that would happen were |undefined| to be used. var key = -/a/g.missingProperty; var s = new Set(); @@ -46,11 +38,3 @@ s.delete(key); assertEq(s.has(key), false); assertEq(s.has(-key), false); assertEq(s.has(NaN), false); - - -/******************************************************************************/ - -if (typeof reportCompare === "function") - reportCompare(true, true); - -print("Tests complete"); diff --git a/js/src/tests/non262/Set/forEach-selfhosted-behavior.js b/js/src/jit-test/tests/Set/forEach-selfhosted-behavior.js similarity index 65% rename from js/src/tests/non262/Set/forEach-selfhosted-behavior.js rename to js/src/jit-test/tests/Set/forEach-selfhosted-behavior.js index 37c87feefb6c..ca6363be5c1f 100644 --- a/js/src/tests/non262/Set/forEach-selfhosted-behavior.js +++ b/js/src/jit-test/tests/Set/forEach-selfhosted-behavior.js @@ -3,15 +3,7 @@ * http://creativecommons.org/licenses/publicdomain/ */ -//----------------------------------------------------------------------------- -var BUGNUMBER = 987243; -var summary = "Don't use .call(...) in the self-hosted Set.prototype.forEach"; - -print(BUGNUMBER + ": " + summary); - -/************** - * BEGIN TEST * - **************/ +// Don't use .call(...) in the self-hosted Set.prototype.forEach var functionCall = Function.prototype.call; @@ -42,10 +34,3 @@ new Set([new Number]).forEach(lalala); new Set([true, new Boolean(false)]).forEach(lalala); assertEq(callCount, 0); - -/******************************************************************************/ - -if (typeof reportCompare === "function") - reportCompare(true, true); - -print("Tests complete"); diff --git a/js/src/jit-test/tests/Set/getter-name.js b/js/src/jit-test/tests/Set/getter-name.js new file mode 100644 index 000000000000..fe049d32a974 --- /dev/null +++ b/js/src/jit-test/tests/Set/getter-name.js @@ -0,0 +1,3 @@ +// Set getters should have get prefix +assertEq(Object.getOwnPropertyDescriptor(Set, Symbol.species).get.name, "get [Symbol.species]"); +assertEq(Object.getOwnPropertyDescriptor(Set.prototype, "size").get.name, "get size"); diff --git a/js/src/tests/non262/Set/iterator-thisv-error.js b/js/src/jit-test/tests/Set/iterator-thisv-error.js similarity index 88% rename from js/src/tests/non262/Set/iterator-thisv-error.js rename to js/src/jit-test/tests/Set/iterator-thisv-error.js index b2b59808e3fc..b8a4e65196e6 100644 --- a/js/src/tests/non262/Set/iterator-thisv-error.js +++ b/js/src/jit-test/tests/Set/iterator-thisv-error.js @@ -17,6 +17,3 @@ for (var thisv of [null, undefined, false, true, 0, ""]) { test(Set.prototype.keys, thisv); test(Set.prototype[Symbol.iterator], thisv); } - -if (typeof reportCompare === "function") - reportCompare(0, 0); diff --git a/js/src/tests/non262/Set/non-iterable-error.js b/js/src/jit-test/tests/Set/non-iterable-error.js similarity index 69% rename from js/src/tests/non262/Set/non-iterable-error.js rename to js/src/jit-test/tests/Set/non-iterable-error.js index 7781993fd216..e2702abb4990 100644 --- a/js/src/tests/non262/Set/non-iterable-error.js +++ b/js/src/jit-test/tests/Set/non-iterable-error.js @@ -5,6 +5,3 @@ try { } catch (e) { assertEq(e.message, "1 is not iterable"); } - -if (typeof reportCompare === "function") - reportCompare(0, 0); diff --git a/js/src/tests/non262/Set/symbols.js b/js/src/jit-test/tests/Set/symbols.js similarity index 91% rename from js/src/tests/non262/Set/symbols.js rename to js/src/jit-test/tests/Set/symbols.js index 72a00c943f73..f272102800c6 100644 --- a/js/src/tests/non262/Set/symbols.js +++ b/js/src/jit-test/tests/Set/symbols.js @@ -1,6 +1,8 @@ /* Any copyright is dedicated to the Public Domain. * http://creativecommons.org/licenses/publicdomain/ */ +load(libdir + "asserts.js"); + var s = new Set; // Symbols can be stored in Sets. @@ -22,6 +24,3 @@ var s2 = "how much wood would a woodchuck chuck if could"; var arr = str.split(" ").map(Symbol.for); s = new Set(arr); assertDeepEq([...s], s2.split(" ").map(Symbol.for)); - -if (typeof reportCompare === "function") - reportCompare(0, 0); diff --git a/js/src/tests/non262/Set/browser.js b/js/src/tests/non262/Set/browser.js deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/js/src/tests/non262/Set/getter-name.js b/js/src/tests/non262/Set/getter-name.js deleted file mode 100644 index 9a3e84fa45b9..000000000000 --- a/js/src/tests/non262/Set/getter-name.js +++ /dev/null @@ -1,10 +0,0 @@ -var BUGNUMBER = 1180290; -var summary = 'Set getters should have get prefix'; - -print(BUGNUMBER + ": " + summary); - -assertEq(Object.getOwnPropertyDescriptor(Set, Symbol.species).get.name, "get [Symbol.species]"); -assertEq(Object.getOwnPropertyDescriptor(Set.prototype, "size").get.name, "get size"); - -if (typeof reportCompare === 'function') - reportCompare(true, true); diff --git a/js/src/tests/non262/Set/shell.js b/js/src/tests/non262/Set/shell.js deleted file mode 100644 index e69de29bb2d1..000000000000