From 21f6a86a6d49d5d5eb2ec98e6b5147a43cc67b4e Mon Sep 17 00:00:00 2001
From: Adrian Heine <mail@adrianheine.de>
Date: Sun, 7 Oct 2018 20:43:56 +0200
Subject: [PATCH] Remove explicit sta.js includes
INTERPRETING.md states that sta.js has to be included unconditionally.
---
test/harness/assert-false.js | 1 -
test/harness/assert-notsamevalue-nan.js | 1 -
test/harness/assert-obj.js | 1 -
test/harness/assert-samevalue-objects.js | 1 -
test/harness/assert-samevalue-zeros.js | 1 -
test/harness/assert-throws-incorrect-ctor.js | 1 -
test/harness/assert-throws-native.js | 1 -
test/harness/assert-throws-no-arg.js | 1 -
test/harness/assert-throws-no-error.js | 1 -
test/harness/assert-throws-null-fn.js | 1 -
test/harness/assert-throws-null.js | 1 -
test/harness/assert-throws-primitive.js | 1 -
test/harness/assert-throws-single-arg.js | 1 -
test/harness/assertRelativeDateMs.js | 2 +-
test/harness/detachArrayBuffer-host-detachArrayBuffer.js | 2 +-
test/harness/detachArrayBuffer.js | 2 --
test/harness/promiseHelper.js | 2 +-
...ertyhelper-verifyconfigurable-not-configurable-not-strict.js | 2 +-
...propertyhelper-verifyconfigurable-not-configurable-strict.js | 2 +-
.../propertyhelper-verifyenumerable-not-enumerable-symbol.js | 2 +-
test/harness/propertyhelper-verifyenumerable-not-enumerable.js | 2 +-
.../propertyhelper-verifynotconfigurable-configurable.js | 2 +-
...pertyhelper-verifynotconfigurable-not-configurable-strict.js | 2 +-
.../propertyhelper-verifynotenumerable-enumerable-symbol.js | 2 +-
test/harness/propertyhelper-verifynotenumerable-enumerable.js | 2 +-
test/harness/propertyhelper-verifynotwritable-writable.js | 2 +-
.../propertyhelper-verifywritable-not-writable-not-strict.js | 2 +-
.../propertyhelper-verifywritable-not-writable-strict.js | 2 +-
test/harness/sta-error.js | 1 -
test/harness/sta-override-error.js | 1 -
test/harness/sta.js | 2 --
test/harness/verifyProperty-arguments.js | 2 +-
test/harness/verifyProperty-desc-is-not-object.js | 2 +-
test/harness/verifyProperty-noproperty.js | 2 +-
test/harness/verifyProperty-undefined-desc.js | 2 +-
test/harness/verifyProperty-value-error.js | 2 +-
36 files changed, 19 insertions(+), 38 deletions(-)
diff --git a/test/harness/assert-false.js b/test/harness/assert-false.js
index 0c8f175d91..93b8205813 100644
--- a/test/harness/assert-false.js
+++ b/test/harness/assert-false.js
@@ -4,7 +4,6 @@
/*---
description: >
`false` does not satisfy the assertion.
-includes: [sta.js]
---*/
var threw = false;
diff --git a/test/harness/assert-notsamevalue-nan.js b/test/harness/assert-notsamevalue-nan.js
index 5b784150cd..856cc482c7 100644
--- a/test/harness/assert-notsamevalue-nan.js
+++ b/test/harness/assert-notsamevalue-nan.js
@@ -4,7 +4,6 @@
/*---
description: >
Two references to NaN do not satisfy the assertion.
-includes: [sta.js]
---*/
var threw = false;
diff --git a/test/harness/assert-obj.js b/test/harness/assert-obj.js
index 2b934a3b85..edaf82fc69 100644
--- a/test/harness/assert-obj.js
+++ b/test/harness/assert-obj.js
@@ -4,7 +4,6 @@
/*---
description: >
An object literal does not satisfy the assertion.
-includes: [sta.js]
---*/
var threw = false;
diff --git a/test/harness/assert-samevalue-objects.js b/test/harness/assert-samevalue-objects.js
index 03c0d80ba4..833f864b4d 100644
--- a/test/harness/assert-samevalue-objects.js
+++ b/test/harness/assert-samevalue-objects.js
@@ -4,7 +4,6 @@
/*---
description: >
Distinct objects do not satisfy the assertion.
-includes: [sta.js]
---*/
var threw = false;
diff --git a/test/harness/assert-samevalue-zeros.js b/test/harness/assert-samevalue-zeros.js
index 461b93e8ef..a4a44a031d 100644
--- a/test/harness/assert-samevalue-zeros.js
+++ b/test/harness/assert-samevalue-zeros.js
@@ -4,7 +4,6 @@
/*---
description: >
Positive and negative zero do not satisfy the assertion.
-includes: [sta.js]
---*/
var threw = false;
diff --git a/test/harness/assert-throws-incorrect-ctor.js b/test/harness/assert-throws-incorrect-ctor.js
index 5384bec0b2..b12f06ee77 100644
--- a/test/harness/assert-throws-incorrect-ctor.js
+++ b/test/harness/assert-throws-incorrect-ctor.js
@@ -5,7 +5,6 @@
description: >
Functions that throw values whose constructor does not match the specified
constructor do not satisfy the assertion.
-includes: [sta.js]
---*/
var threw = false;
diff --git a/test/harness/assert-throws-native.js b/test/harness/assert-throws-native.js
index 6c03b50fa6..7650acb19e 100644
--- a/test/harness/assert-throws-native.js
+++ b/test/harness/assert-throws-native.js
@@ -5,7 +5,6 @@
description: >
Functions that throw instances of the specified native Error constructor
satisfy the assertion.
-includes: [sta.js]
---*/
assert.throws(Error, function() {
diff --git a/test/harness/assert-throws-no-arg.js b/test/harness/assert-throws-no-arg.js
index 1d37975834..c8a9f3510b 100644
--- a/test/harness/assert-throws-no-arg.js
+++ b/test/harness/assert-throws-no-arg.js
@@ -4,7 +4,6 @@
/*---
description: >
The assertion fails when invoked without arguments.
-includes: [sta.js]
---*/
var threw = false;
diff --git a/test/harness/assert-throws-no-error.js b/test/harness/assert-throws-no-error.js
index 5b7cfda1de..d40b06b44c 100644
--- a/test/harness/assert-throws-no-error.js
+++ b/test/harness/assert-throws-no-error.js
@@ -4,7 +4,6 @@
/*---
description: >
Functions that do not throw errors do not satisfy the assertion.
-includes: [sta.js]
---*/
var threw = false;
diff --git a/test/harness/assert-throws-null-fn.js b/test/harness/assert-throws-null-fn.js
index 8d974da64d..741751498a 100644
--- a/test/harness/assert-throws-null-fn.js
+++ b/test/harness/assert-throws-null-fn.js
@@ -4,7 +4,6 @@
/*---
description: >
Fails if second arg is not a function
-includes: [sta.js]
---*/
var threw = false;
diff --git a/test/harness/assert-throws-null.js b/test/harness/assert-throws-null.js
index 227b83ab4e..7b10f61247 100644
--- a/test/harness/assert-throws-null.js
+++ b/test/harness/assert-throws-null.js
@@ -4,7 +4,6 @@
/*---
description: >
Functions that throw the `null` value do not satisfy the assertion.
-includes: [sta.js]
---*/
var threw = false;
diff --git a/test/harness/assert-throws-primitive.js b/test/harness/assert-throws-primitive.js
index 9550961793..0a2d8f9e2a 100644
--- a/test/harness/assert-throws-primitive.js
+++ b/test/harness/assert-throws-primitive.js
@@ -4,7 +4,6 @@
/*---
description: >
Functions that throw primitive values do not satisfy the assertion.
-includes: [sta.js]
---*/
var threw = false;
diff --git a/test/harness/assert-throws-single-arg.js b/test/harness/assert-throws-single-arg.js
index ab10128603..2b8ca71356 100644
--- a/test/harness/assert-throws-single-arg.js
+++ b/test/harness/assert-throws-single-arg.js
@@ -4,7 +4,6 @@
/*---
description: >
The assertion fails when invoked with a single argument.
-includes: [sta.js]
---*/
var threw = false;
diff --git a/test/harness/assertRelativeDateMs.js b/test/harness/assertRelativeDateMs.js
index 77022f0747..c8c08b3b67 100644
--- a/test/harness/assertRelativeDateMs.js
+++ b/test/harness/assertRelativeDateMs.js
@@ -4,7 +4,7 @@
description: >
Only passes when the provided date is exactly the specified number of
milliseconds from the Unix epoch
-includes: [assertRelativeDateMs.js,sta.js]
+includes: [assertRelativeDateMs.js]
---*/
var thrown;
diff --git a/test/harness/detachArrayBuffer-host-detachArrayBuffer.js b/test/harness/detachArrayBuffer-host-detachArrayBuffer.js
index 2455167567..2eb65d74f9 100644
--- a/test/harness/detachArrayBuffer-host-detachArrayBuffer.js
+++ b/test/harness/detachArrayBuffer-host-detachArrayBuffer.js
@@ -8,7 +8,7 @@ description: >
$DETACHBUFFER relies on the presence of a host definition for $262.detachArrayBuffer
-includes: [detachArrayBuffer.js,sta.js]
+includes: [detachArrayBuffer.js]
---*/
var $262 = {
diff --git a/test/harness/detachArrayBuffer.js b/test/harness/detachArrayBuffer.js
index 71eb7dfa01..6c25d36eda 100644
--- a/test/harness/detachArrayBuffer.js
+++ b/test/harness/detachArrayBuffer.js
@@ -9,8 +9,6 @@ description: >
$DETACHBUFFER relies on the presence of a definition for $262.detachArrayBuffer.
Without a definition, calling $DETACHBUFFER will result in a ReferenceError
-
-includes: [sta.js]
---*/
var ab = new ArrayBuffer(1);
diff --git a/test/harness/promiseHelper.js b/test/harness/promiseHelper.js
index 59e8b66991..d65271dad1 100644
--- a/test/harness/promiseHelper.js
+++ b/test/harness/promiseHelper.js
@@ -10,7 +10,7 @@ description: >
of numbers, each added during some operation, and verifies that they
are in numeric order.
-includes: [promiseHelper.js,sta.js]
+includes: [promiseHelper.js]
---*/
assert(checkSequence([1, 2, 3, 4, 5]));
diff --git a/test/harness/propertyhelper-verifyconfigurable-not-configurable-not-strict.js b/test/harness/propertyhelper-verifyconfigurable-not-configurable-not-strict.js
index e84182d79a..e8216b2329 100644
--- a/test/harness/propertyhelper-verifyconfigurable-not-configurable-not-strict.js
+++ b/test/harness/propertyhelper-verifyconfigurable-not-configurable-not-strict.js
@@ -5,7 +5,7 @@
description: >
Objects whose specified property is not configurable do not satisfy the
assertion outside of strict mode.
-includes: [propertyHelper.js,sta.js]
+includes: [propertyHelper.js]
flags: [noStrict]
---*/
diff --git a/test/harness/propertyhelper-verifyconfigurable-not-configurable-strict.js b/test/harness/propertyhelper-verifyconfigurable-not-configurable-strict.js
index 23f05344bf..129d786d49 100644
--- a/test/harness/propertyhelper-verifyconfigurable-not-configurable-strict.js
+++ b/test/harness/propertyhelper-verifyconfigurable-not-configurable-strict.js
@@ -5,7 +5,7 @@
description: >
Objects whose specified property is not configurable do not satisfy the
assertion in strict mode.
-includes: [propertyHelper.js,sta.js]
+includes: [propertyHelper.js]
flags: [onlyStrict]
---*/
var threw = false;
diff --git a/test/harness/propertyhelper-verifyenumerable-not-enumerable-symbol.js b/test/harness/propertyhelper-verifyenumerable-not-enumerable-symbol.js
index 2f0d2461bb..ab36f14cc2 100644
--- a/test/harness/propertyhelper-verifyenumerable-not-enumerable-symbol.js
+++ b/test/harness/propertyhelper-verifyenumerable-not-enumerable-symbol.js
@@ -5,7 +5,7 @@
description: >
Objects whose specified symbol property is not enumerable do not satisfy the
assertion.
-includes: [propertyHelper.js,sta.js]
+includes: [propertyHelper.js]
features: [Symbol]
---*/
var threw = false;
diff --git a/test/harness/propertyhelper-verifyenumerable-not-enumerable.js b/test/harness/propertyhelper-verifyenumerable-not-enumerable.js
index fcb4dfce5f..fb4ccc031d 100644
--- a/test/harness/propertyhelper-verifyenumerable-not-enumerable.js
+++ b/test/harness/propertyhelper-verifyenumerable-not-enumerable.js
@@ -5,7 +5,7 @@
description: >
Objects whose specified string property is not enumerable do not satisfy the
assertion.
-includes: [propertyHelper.js,sta.js]
+includes: [propertyHelper.js]
---*/
var threw = false;
var obj = {};
diff --git a/test/harness/propertyhelper-verifynotconfigurable-configurable.js b/test/harness/propertyhelper-verifynotconfigurable-configurable.js
index 6c8bb5af2d..6db04baf83 100644
--- a/test/harness/propertyhelper-verifynotconfigurable-configurable.js
+++ b/test/harness/propertyhelper-verifynotconfigurable-configurable.js
@@ -5,7 +5,7 @@
description: >
Objects whose specified property is configurable do not satisfy the
assertion.
-includes: [propertyHelper.js,sta.js]
+includes: [propertyHelper.js]
---*/
var threw = false;
var obj = {};
diff --git a/test/harness/propertyhelper-verifynotconfigurable-not-configurable-strict.js b/test/harness/propertyhelper-verifynotconfigurable-not-configurable-strict.js
index 56f82b31fa..d237a2b7da 100644
--- a/test/harness/propertyhelper-verifynotconfigurable-not-configurable-strict.js
+++ b/test/harness/propertyhelper-verifynotconfigurable-not-configurable-strict.js
@@ -5,7 +5,7 @@
description: >
Objects whose specified property is not configurable satisfy the assertion
in strict mode.
-includes: [propertyHelper.js,sta.js]
+includes: [propertyHelper.js]
flags: [onlyStrict]
---*/
var obj = {};
diff --git a/test/harness/propertyhelper-verifynotenumerable-enumerable-symbol.js b/test/harness/propertyhelper-verifynotenumerable-enumerable-symbol.js
index 8e6f0cdcae..42e369bebd 100644
--- a/test/harness/propertyhelper-verifynotenumerable-enumerable-symbol.js
+++ b/test/harness/propertyhelper-verifynotenumerable-enumerable-symbol.js
@@ -5,7 +5,7 @@
description: >
Objects whose specified symbol property is enumerable do not satisfy the
assertion.
-includes: [propertyHelper.js,sta.js]
+includes: [propertyHelper.js]
features: [Symbol]
---*/
var threw = false;
diff --git a/test/harness/propertyhelper-verifynotenumerable-enumerable.js b/test/harness/propertyhelper-verifynotenumerable-enumerable.js
index 65e63bb360..3c762340c0 100644
--- a/test/harness/propertyhelper-verifynotenumerable-enumerable.js
+++ b/test/harness/propertyhelper-verifynotenumerable-enumerable.js
@@ -5,7 +5,7 @@
description: >
Objects whose specified string property is enumerable do not satisfy the
assertion.
-includes: [propertyHelper.js,sta.js]
+includes: [propertyHelper.js]
---*/
var threw = false;
var obj = {};
diff --git a/test/harness/propertyhelper-verifynotwritable-writable.js b/test/harness/propertyhelper-verifynotwritable-writable.js
index eb851add34..d86e5af37e 100644
--- a/test/harness/propertyhelper-verifynotwritable-writable.js
+++ b/test/harness/propertyhelper-verifynotwritable-writable.js
@@ -4,7 +4,7 @@
/*---
description: >
Objects whose specified property is writable do not satisfy the assertion.
-includes: [propertyHelper.js,sta.js]
+includes: [propertyHelper.js]
---*/
var threw = false;
var obj = {};
diff --git a/test/harness/propertyhelper-verifywritable-not-writable-not-strict.js b/test/harness/propertyhelper-verifywritable-not-writable-not-strict.js
index 591aabaa56..320cbc8b93 100644
--- a/test/harness/propertyhelper-verifywritable-not-writable-not-strict.js
+++ b/test/harness/propertyhelper-verifywritable-not-writable-not-strict.js
@@ -5,7 +5,7 @@
description: >
Objects whose specified property is not writable do not satisfy the
assertion outside of strict mode.
-includes: [propertyHelper.js,sta.js]
+includes: [propertyHelper.js]
flags: [noStrict]
---*/
var threw = false;
diff --git a/test/harness/propertyhelper-verifywritable-not-writable-strict.js b/test/harness/propertyhelper-verifywritable-not-writable-strict.js
index da60196ef6..4d6e3575e6 100644
--- a/test/harness/propertyhelper-verifywritable-not-writable-strict.js
+++ b/test/harness/propertyhelper-verifywritable-not-writable-strict.js
@@ -6,7 +6,7 @@ description: >
Objects whose specified property is not writable do not satisfy the
assertion in strict mode.
-includes: [propertyHelper.js,sta.js]
+includes: [propertyHelper.js]
flags: [onlyStrict]
---*/
var threw = false;
diff --git a/test/harness/sta-error.js b/test/harness/sta-error.js
index 36463225c5..f5d8e695eb 100644
--- a/test/harness/sta-error.js
+++ b/test/harness/sta-error.js
@@ -5,7 +5,6 @@
description: >
The global `$ERROR` function throws an instance of the global `Test262Error`
function with the specified message.
-includes: [sta.js]
---*/
var threw = false;
diff --git a/test/harness/sta-override-error.js b/test/harness/sta-override-error.js
index 840470b13c..76e794121d 100644
--- a/test/harness/sta-override-error.js
+++ b/test/harness/sta-override-error.js
@@ -9,7 +9,6 @@ description: >
$ERROR
Assert that global $ERROR is overridable
-includes: [sta.js]
---*/
function BaloneyError() {}
diff --git a/test/harness/sta.js b/test/harness/sta.js
index d439f20294..6672c385fe 100644
--- a/test/harness/sta.js
+++ b/test/harness/sta.js
@@ -6,8 +6,6 @@ description: >
Test262Error
$ERROR
-
-includes: [sta.js]
---*/
assert(typeof Test262Error === "function");
diff --git a/test/harness/verifyProperty-arguments.js b/test/harness/verifyProperty-arguments.js
index 37c9ed3ad8..9f6daf137c 100644
--- a/test/harness/verifyProperty-arguments.js
+++ b/test/harness/verifyProperty-arguments.js
@@ -4,7 +4,7 @@
/*---
description: >
verifyProperty should receive at least 3 arguments: obj, name, and descriptor
-includes: [propertyHelper.js,sta.js]
+includes: [propertyHelper.js]
---*/
assert.throws(Test262Error, () => {
verifyProperty();
diff --git a/test/harness/verifyProperty-desc-is-not-object.js b/test/harness/verifyProperty-desc-is-not-object.js
index d269d6737d..900b8dfa86 100644
--- a/test/harness/verifyProperty-desc-is-not-object.js
+++ b/test/harness/verifyProperty-desc-is-not-object.js
@@ -4,7 +4,7 @@
/*---
description: >
The desc argument should be an object or undefined
-includes: [propertyHelper.js,sta.js]
+includes: [propertyHelper.js]
features: [Symbol]
---*/
var sample = { foo: 42 };
diff --git a/test/harness/verifyProperty-noproperty.js b/test/harness/verifyProperty-noproperty.js
index aec783cc5a..1a4710f92c 100644
--- a/test/harness/verifyProperty-noproperty.js
+++ b/test/harness/verifyProperty-noproperty.js
@@ -4,7 +4,7 @@
/*---
description: >
The first argument should have an own property
-includes: [propertyHelper.js,sta.js]
+includes: [propertyHelper.js]
---*/
assert.throws(Test262Error, () => {
verifyProperty(Object, 'JeanPaulSartre', {});
diff --git a/test/harness/verifyProperty-undefined-desc.js b/test/harness/verifyProperty-undefined-desc.js
index 590fd62892..83f0b997c3 100644
--- a/test/harness/verifyProperty-undefined-desc.js
+++ b/test/harness/verifyProperty-undefined-desc.js
@@ -4,7 +4,7 @@
/*---
description: >
Verify an undefined descriptor
-includes: [propertyHelper.js,sta.js]
+includes: [propertyHelper.js]
---*/
var sample = {
bar: undefined,
diff --git a/test/harness/verifyProperty-value-error.js b/test/harness/verifyProperty-value-error.js
index 2a97967c8f..0145cac2e8 100644
--- a/test/harness/verifyProperty-value-error.js
+++ b/test/harness/verifyProperty-value-error.js
@@ -8,7 +8,7 @@ description: >
verifyProperty()
...
-includes: [propertyHelper.js,sta.js]
+includes: [propertyHelper.js]
---*/
var threw = false;
--
GitLab