Merging upstream version 127.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

9 files changed, 10 insertions, 10 deletions

diff --git a/js/src/tests/test262/built-ins/Atomics/and/bad-range.js b/js/src/tests/test262/built-ins/Atomics/and/bad-range.js
index 8548ab5dc3..1f1d83102b 100644
--- a/js/src/tests/test262/built-ins/Atomics/and/bad-range.js
+++ b/js/src/tests/test262/built-ins/Atomics/and/bad-range.js
@@ -1,4 +1,4 @@
-// |reftest| skip-if(!this.hasOwnProperty('Atomics')||!this.hasOwnProperty('SharedArrayBuffer')||(this.hasOwnProperty('getBuildConfiguration')&&getBuildConfiguration('arm64-simulator'))) -- Atomics,SharedArrayBuffer is not enabled unconditionally, ARM64 Simulator cannot emulate atomics
+// |reftest| shell-option(--enable-float16array) skip-if(!this.hasOwnProperty('Atomics')||!this.hasOwnProperty('SharedArrayBuffer')||(this.hasOwnProperty('getBuildConfiguration')&&getBuildConfiguration('arm64-simulator'))) -- Atomics,SharedArrayBuffer is not enabled unconditionally, ARM64 Simulator cannot emulate atomics
 // Copyright (C) 2017 Mozilla Corporation.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
@@ -18,7 +18,7 @@ testWithTypedArrayConstructors(function(TA) {
   testWithAtomicsOutOfBoundsIndices(function(IdxGen) {
     assert.throws(RangeError, function() {
       Atomics.and(view, IdxGen(view), 10);
-    }, '`Atomics.and(view, IdxGen(view), 10)` throws RangeError');
+    });
   });
 }, views);
 
diff --git a/js/src/tests/test262/built-ins/Atomics/and/bigint/bad-range.js b/js/src/tests/test262/built-ins/Atomics/and/bigint/bad-range.js
index a64ae66282..a031bc31e2 100644
--- a/js/src/tests/test262/built-ins/Atomics/and/bigint/bad-range.js
+++ b/js/src/tests/test262/built-ins/Atomics/and/bigint/bad-range.js
@@ -16,7 +16,7 @@ testWithBigIntTypedArrayConstructors(function(TA) {
   testWithAtomicsOutOfBoundsIndices(function(IdxGen) {
     assert.throws(RangeError, function() {
       Atomics.and(view, IdxGen(view), 10n);
-    }, '`Atomics.and(view, IdxGen(view), 10n)` throws RangeError');
+    });
   });
 });
 
diff --git a/js/src/tests/test262/built-ins/Atomics/and/good-views.js b/js/src/tests/test262/built-ins/Atomics/and/good-views.js
index 532b75674d..0e5a40ec00 100644
--- a/js/src/tests/test262/built-ins/Atomics/and/good-views.js
+++ b/js/src/tests/test262/built-ins/Atomics/and/good-views.js
@@ -1,4 +1,4 @@
-// |reftest| skip-if(!this.hasOwnProperty('Atomics')||!this.hasOwnProperty('SharedArrayBuffer')||(this.hasOwnProperty('getBuildConfiguration')&&getBuildConfiguration('arm64-simulator'))) -- Atomics,SharedArrayBuffer is not enabled unconditionally, ARM64 Simulator cannot emulate atomics
+// |reftest| shell-option(--enable-float16array) skip-if(!this.hasOwnProperty('Atomics')||!this.hasOwnProperty('SharedArrayBuffer')||(this.hasOwnProperty('getBuildConfiguration')&&getBuildConfiguration('arm64-simulator'))) -- Atomics,SharedArrayBuffer is not enabled unconditionally, ARM64 Simulator cannot emulate atomics
 // Copyright (C) 2017 Mozilla Corporation.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
diff --git a/js/src/tests/test262/built-ins/Atomics/and/non-shared-bufferdata.js b/js/src/tests/test262/built-ins/Atomics/and/non-shared-bufferdata.js
index be959d353d..ab6945fcb7 100644
--- a/js/src/tests/test262/built-ins/Atomics/and/non-shared-bufferdata.js
+++ b/js/src/tests/test262/built-ins/Atomics/and/non-shared-bufferdata.js
@@ -1,4 +1,4 @@
-// |reftest| skip-if(!this.hasOwnProperty('Atomics')) -- Atomics is not enabled unconditionally
+// |reftest| shell-option(--enable-float16array) skip-if(!this.hasOwnProperty('Atomics')) -- Atomics is not enabled unconditionally
 // Copyright (C) 2020 Rick Waldron. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
diff --git a/js/src/tests/test262/built-ins/Atomics/and/non-shared-int-views-throws.js b/js/src/tests/test262/built-ins/Atomics/and/non-shared-int-views-throws.js
index 90987ae1ce..67eee61a82 100644
--- a/js/src/tests/test262/built-ins/Atomics/and/non-shared-int-views-throws.js
+++ b/js/src/tests/test262/built-ins/Atomics/and/non-shared-int-views-throws.js
@@ -1,4 +1,4 @@
-// |reftest| skip-if(!this.hasOwnProperty('Atomics')) -- Atomics is not enabled unconditionally
+// |reftest| shell-option(--enable-float16array) skip-if(!this.hasOwnProperty('Atomics')) -- Atomics is not enabled unconditionally
 // Copyright (C) 2020 Rick Waldron. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
diff --git a/js/src/tests/test262/built-ins/Atomics/and/non-views.js b/js/src/tests/test262/built-ins/Atomics/and/non-views.js
index 49732f95c9..37b64d1d7f 100644
--- a/js/src/tests/test262/built-ins/Atomics/and/non-views.js
+++ b/js/src/tests/test262/built-ins/Atomics/and/non-views.js
@@ -13,7 +13,7 @@ features: [ArrayBuffer, Atomics, DataView, SharedArrayBuffer, Symbol, TypedArray
 testWithAtomicsNonViewValues(function(view) {
   assert.throws(TypeError, function() {
     Atomics.and(view, 0, 0);
-  }, '`Atomics.and(view, 0, 0)` throws TypeError');
+  });
 });
 
 reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Atomics/and/not-a-constructor.js b/js/src/tests/test262/built-ins/Atomics/and/not-a-constructor.js
index 9f6fb08569..c47a6e16b8 100644
--- a/js/src/tests/test262/built-ins/Atomics/and/not-a-constructor.js
+++ b/js/src/tests/test262/built-ins/Atomics/and/not-a-constructor.js
@@ -26,7 +26,7 @@ assert.sameValue(isConstructor(Atomics.and), false, 'isConstructor(Atomics.and)
 
 assert.throws(TypeError, () => {
   new Atomics.and(new Int32Array(new SharedArrayBuffer(Int32Array.BYTES_PER_ELEMENT)));
-}, '`new Atomics.and(new Int32Array(new SharedArrayBuffer(Int32Array.BYTES_PER_ELEMENT)))` throws TypeError');
+});
 
 
 reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Atomics/and/validate-arraytype-before-index-coercion.js b/js/src/tests/test262/built-ins/Atomics/and/validate-arraytype-before-index-coercion.js
index edfe4f88d0..e46ff549b4 100644
--- a/js/src/tests/test262/built-ins/Atomics/and/validate-arraytype-before-index-coercion.js
+++ b/js/src/tests/test262/built-ins/Atomics/and/validate-arraytype-before-index-coercion.js
@@ -1,4 +1,4 @@
-// |reftest| skip-if(!this.hasOwnProperty('Atomics')) -- Atomics is not enabled unconditionally
+// |reftest| shell-option(--enable-float16array) skip-if(!this.hasOwnProperty('Atomics')) -- Atomics is not enabled unconditionally
 // Copyright (C) 2019 André Bargull. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
diff --git a/js/src/tests/test262/built-ins/Atomics/and/validate-arraytype-before-value-coercion.js b/js/src/tests/test262/built-ins/Atomics/and/validate-arraytype-before-value-coercion.js
index 30b017f6b4..4235d4ad32 100644
--- a/js/src/tests/test262/built-ins/Atomics/and/validate-arraytype-before-value-coercion.js
+++ b/js/src/tests/test262/built-ins/Atomics/and/validate-arraytype-before-value-coercion.js
@@ -1,4 +1,4 @@
-// |reftest| skip-if(!this.hasOwnProperty('Atomics')) -- Atomics is not enabled unconditionally
+// |reftest| shell-option(--enable-float16array) skip-if(!this.hasOwnProperty('Atomics')) -- Atomics is not enabled unconditionally
 // Copyright (C) 2019 André Bargull. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.