Rename non262-shell.js and remove no longer used non262.js

2025-09-23 10:08:49 +02:00 · 2025-04-30 14:16:09 +02:00 · 2025-04-30 14:16:09 +02:00 · 76cd14cf50
commit 76cd14cf50
parent 5853b56f6e
28 changed files with 49 additions and 113 deletions
--- a/harness/sm/assertThrowsValue.js
+++ b/harness/sm/assertThrowsValue.js
@ -0,0 +1,24 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+/*---
+defines: [assertThrowsValue]
+---*/
+
+function assertThrowsValue(f, val, msg) {
+  try {
+    f();
+  } catch (exc) {
+    assert.sameValue(exc, val, msg);
+    return;
+  }
+
+  var fullmsg = "Assertion failed: expected exception, no exception thrown";
+  if (msg !== void 0) {
+    fullmsg += " - " + msg;
+  }
+  throw new Test262Error(fullmsg);
+}
--- a/harness/sm/non262-shell.js
+++ b/harness/sm/non262-shell.js
@ -1,32 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/*---
-defines: [assertThrowsValue]
-allow_unused: True
---*/
-
-(function() {
-  const undefined = void 0;
-
-  if (typeof globalThis.assertThrowsValue === 'undefined') {
-    globalThis.assertThrowsValue = function assertThrowsValue(f, val, msg) {
-      var fullmsg;
-      try {
-        f();
-      } catch (exc) {
-        if ((exc === val) === (val === val) && (val !== 0 || 1 / exc === 1 / val))
-          return;
-        fullmsg = "Assertion failed: expected exception " + val + ", got " + exc;
-      }
-      if (fullmsg === undefined)
-        fullmsg = "Assertion failed: expected exception " + val + ", no exception thrown";
-      if (msg !== undefined)
-        fullmsg += " - " + msg;
-      throw new Error(fullmsg);
-    };
-  }
-})();
--- a/harness/sm/non262.js
+++ b/harness/sm/non262.js
@ -1,56 +0,0 @@
-/*---
-defines: [assertThrownErrorContains, assertThrowsInstanceOfWithMessageCheck, newGlobal, print, assertEq, reportCompare, createIsHTMLDDA, createExternalArrayBuffer]
---*/
-
-function assertThrownErrorContains(f, substr) {
-  try {
-    f();
-  } catch (exc) {
-    // Do not test error messages
-    return;
-  }
-  throw new Test262Error("Expected error containing " + substr + ", no exception thrown");
-}
-
-function assertThrowsInstanceOfWithMessageCheck(f, ctor, _check, msg) {
-  var fullmsg;
-  try {
-    f();
-  } catch (exc) {
-    if (exc instanceof ctor)
-      return;
-    fullmsg = `Assertion failed: expected exception ${ctor.name}, got ${exc}`;
-  }
-
-  if (fullmsg === undefined)
-    fullmsg = `Assertion failed: expected exception ${ctor.name}, no exception thrown`;
-  if (msg !== undefined)
-    fullmsg += " - " + msg;
-
-  throw new Error(fullmsg);
-}
-
-globalThis.createNewGlobal = function() {
-  return $262.createRealm().global
-}
-
-function print(...args) {
-}
-function assertEq(...args) {
-  assert.sameValue(...args)
-}
-function reportCompare(...args) {
-  assert.sameValue(...args)
-}
-
-if (globalThis.createIsHTMLDDA === undefined) {
-  globalThis.createIsHTMLDDA = function createIsHTMLDDA() {
-    return $262.IsHTMLDDA;
-  }
-}
-
-if (globalThis.createExternalArrayBuffer === undefined) {
-  globalThis.createExternalArrayBuffer = function createExternalArrayBuffer(size) {
-    return new ArrayBuffer(size);
-  }
-}
--- a/test/staging/sm/Array/from_errors.js
+++ b/test/staging/sm/Array/from_errors.js
@ -4,7 +4,7 @@
 */

 /*---
-includes: [sm/non262-shell.js, deepEqual.js]
+includes: [sm/assertThrowsValue.js, deepEqual.js]
 flags:
  - noStrict
 description: |
--- a/test/staging/sm/Array/to-length.js
+++ b/test/staging/sm/Array/to-length.js
@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.

 /*---
-includes: [sm/non262-shell.js]
+includes: [sm/assertThrowsValue.js]
 flags:
  - noStrict
 description: |
--- a/test/staging/sm/Function/function-constructor-toString-arguments-before-parsing-params.js
+++ b/test/staging/sm/Function/function-constructor-toString-arguments-before-parsing-params.js
@ -4,7 +4,7 @@
 */

 /*---
-includes: [sm/non262-shell.js]
+includes: [sm/assertThrowsValue.js]
 flags:
  - noStrict
 description: |
--- a/test/staging/sm/Number/20.1.3.2-toExponential.js
+++ b/test/staging/sm/Number/20.1.3.2-toExponential.js
@ -4,7 +4,7 @@
 */

 /*---
-includes: [sm/non262-shell.js]
+includes: [sm/assertThrowsValue.js]
 flags:
  - noStrict
 description: |
--- a/test/staging/sm/Number/20.1.3.2-toPrecision.js
+++ b/test/staging/sm/Number/20.1.3.2-toPrecision.js
@ -4,7 +4,7 @@
 */

 /*---
-includes: [sm/non262-shell.js]
+includes: [sm/assertThrowsValue.js]
 flags:
  - noStrict
 description: |
--- a/test/staging/sm/Proxy/getPrototypeOf.js
+++ b/test/staging/sm/Proxy/getPrototypeOf.js
@ -4,7 +4,7 @@
 */

 /*---
-includes: [sm/non262-shell.js]
+includes: [sm/assertThrowsValue.js]
 flags:
  - noStrict
 description: |
--- a/test/staging/sm/Proxy/setPrototypeOf.js
+++ b/test/staging/sm/Proxy/setPrototypeOf.js
@ -4,7 +4,7 @@
 */

 /*---
-includes: [sm/non262-shell.js]
+includes: [sm/assertThrowsValue.js]
 flags:
  - noStrict
 description: |
--- a/test/staging/sm/Reflect/apply.js
+++ b/test/staging/sm/Reflect/apply.js
@ -4,7 +4,7 @@
 */

 /*---
-includes: [sm/non262-shell.js]
+includes: [sm/assertThrowsValue.js]
 flags:
  - noStrict
 description: |
--- a/test/staging/sm/Reflect/argumentsList.js
+++ b/test/staging/sm/Reflect/argumentsList.js
@ -4,7 +4,7 @@
 */

 /*---
-includes: [sm/non262-shell.js, sm/non262-Reflect-shell.js, compareArray.js]
+includes: [sm/assertThrowsValue.js, sm/non262-Reflect-shell.js, compareArray.js]
 flags:
  - noStrict
 description: |
--- a/test/staging/sm/Reflect/defineProperty.js
+++ b/test/staging/sm/Reflect/defineProperty.js
@ -6,7 +6,7 @@
 /*---
 features:
  - IsHTMLDDA
-includes: [sm/non262-shell.js, sm/non262-Reflect-shell.js, deepEqual.js]
+includes: [sm/assertThrowsValue.js, sm/non262-Reflect-shell.js, deepEqual.js]
 flags:
  - noStrict
 description: |
--- a/test/staging/sm/Reflect/deleteProperty.js
+++ b/test/staging/sm/Reflect/deleteProperty.js
@ -4,7 +4,7 @@
 */

 /*---
-includes: [sm/non262-shell.js, deepEqual.js]
+includes: [sm/assertThrowsValue.js, deepEqual.js]
 flags:
  - noStrict
 description: |
--- a/test/staging/sm/Reflect/isExtensible.js
+++ b/test/staging/sm/Reflect/isExtensible.js
@ -4,7 +4,7 @@
 */

 /*---
-includes: [sm/non262-shell.js]
+includes: [sm/assertThrowsValue.js]
 flags:
  - noStrict
 description: |
--- a/test/staging/sm/Reflect/preventExtensions.js
+++ b/test/staging/sm/Reflect/preventExtensions.js
@ -4,7 +4,7 @@
 */

 /*---
-includes: [sm/non262-shell.js]
+includes: [sm/assertThrowsValue.js]
 flags:
  - noStrict
 description: |
--- a/test/staging/sm/Reflect/propertyKeys.js
+++ b/test/staging/sm/Reflect/propertyKeys.js
@ -4,7 +4,7 @@
 */

 /*---
-includes: [sm/non262-shell.js, compareArray.js, deepEqual.js]
+includes: [sm/assertThrowsValue.js, compareArray.js, deepEqual.js]
 flags:
  - noStrict
 description: |
--- a/test/staging/sm/Reflect/set.js
+++ b/test/staging/sm/Reflect/set.js
@ -4,7 +4,7 @@
 */

 /*---
-includes: [sm/non262-shell.js, sm/non262-Reflect-shell.js, deepEqual.js]
+includes: [sm/assertThrowsValue.js, sm/non262-Reflect-shell.js, deepEqual.js]
 flags:
  - noStrict
 description: |
--- a/test/staging/sm/TypedArray/from_errors.js
+++ b/test/staging/sm/TypedArray/from_errors.js
@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.

 /*---
-includes: [sm/non262-shell.js, sm/non262-TypedArray-shell.js, deepEqual.js]
+includes: [sm/assertThrowsValue.js, sm/non262-TypedArray-shell.js, deepEqual.js]
 flags:
  - noStrict
 description: |
--- a/test/staging/sm/class/compPropNames.js
+++ b/test/staging/sm/class/compPropNames.js
@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.

 /*---
-includes: [sm/non262-shell.js]
+includes: [sm/assertThrowsValue.js]
 flags:
  - noStrict
 description: |
--- a/test/staging/sm/destructuring/array-iterator-close.js
+++ b/test/staging/sm/destructuring/array-iterator-close.js
@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.

 /*---
-includes: [sm/non262-shell.js]
+includes: [sm/assertThrowsValue.js]
 flags:
  - noStrict
 description: |
--- a/test/staging/sm/expressions/computed-property-side-effects.js
+++ b/test/staging/sm/expressions/computed-property-side-effects.js
@ -4,7 +4,7 @@
 */

 /*---
-includes: [sm/non262-shell.js]
+includes: [sm/assertThrowsValue.js]
 flags:
  - noStrict
 description: |
--- a/test/staging/sm/generators/delegating-yield-10.js
+++ b/test/staging/sm/generators/delegating-yield-10.js
@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.

 /*---
-includes: [sm/non262-shell.js]
+includes: [sm/assertThrowsValue.js]
 flags:
  - noStrict
 description: |
--- a/test/staging/sm/generators/delegating-yield-2.js
+++ b/test/staging/sm/generators/delegating-yield-2.js
@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.

 /*---
-includes: [sm/non262-shell.js, sm/non262-generators-shell.js]
+includes: [sm/assertThrowsValue.js, sm/non262-generators-shell.js]
 flags:
  - noStrict
 description: |
--- a/test/staging/sm/generators/yield-iterator-close.js
+++ b/test/staging/sm/generators/yield-iterator-close.js
@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.

 /*---
-includes: [sm/non262-shell.js]
+includes: [sm/assertThrowsValue.js]
 flags:
  - noStrict
 description: |
--- a/test/staging/sm/generators/yield-star-iterator-close.js
+++ b/test/staging/sm/generators/yield-star-iterator-close.js
@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.

 /*---
-includes: [sm/non262-shell.js]
+includes: [sm/assertThrowsValue.js]
 flags:
  - noStrict
 description: |
--- a/test/staging/sm/statements/for-of-iterator-close-throw.js
+++ b/test/staging/sm/statements/for-of-iterator-close-throw.js
@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.

 /*---
-includes: [sm/non262-shell.js]
+includes: [sm/assertThrowsValue.js]
 flags:
  - noStrict
 description: |
--- a/test/staging/sm/statements/for-of-iterator-close.js
+++ b/test/staging/sm/statements/for-of-iterator-close.js
@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.

 /*---
-includes: [sm/non262-shell.js]
+includes: [sm/assertThrowsValue.js]
 flags:
  - noStrict
 description: |