From c4fae85e7b976041cfefb9374ba12af5c09e95a0 Mon Sep 17 00:00:00 2001 From: Anne van Kesteren Date: Tue, 9 Jul 2019 12:16:20 +0200 Subject: [PATCH 1/2] HTML: cleanup [[CanBlock]] tests (These do not require COOP/COEP treatment as they test SharedArrayBuffer on a single thread, but still seems nice to reduce clutter.) --- .../canblock-dedicatedworker.html | 13 ------------ .../canblock-serviceworker.https.html | 14 ------------- .../canblock-sharedworker.html | 13 ------------ .../canblock-window.html | 21 ------------------- ...ilure.js => requires-failure.https.any.js} | 3 +-- ...res-success.js => requires-success.any.js} | 3 +-- 6 files changed, 2 insertions(+), 65 deletions(-) delete mode 100644 html/webappapis/scripting/processing-model-2/integration-with-the-javascript-agent-formalism/canblock-dedicatedworker.html delete mode 100644 html/webappapis/scripting/processing-model-2/integration-with-the-javascript-agent-formalism/canblock-serviceworker.https.html delete mode 100644 html/webappapis/scripting/processing-model-2/integration-with-the-javascript-agent-formalism/canblock-sharedworker.html delete mode 100644 html/webappapis/scripting/processing-model-2/integration-with-the-javascript-agent-formalism/canblock-window.html rename html/webappapis/scripting/processing-model-2/integration-with-the-javascript-agent-formalism/{worker-that-requires-failure.js => requires-failure.https.any.js} (79%) rename html/webappapis/scripting/processing-model-2/integration-with-the-javascript-agent-formalism/{worker-that-requires-success.js => requires-success.any.js} (78%) diff --git a/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-agent-formalism/canblock-dedicatedworker.html b/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-agent-formalism/canblock-dedicatedworker.html deleted file mode 100644 index 0d559999f3faf8..00000000000000 --- a/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-agent-formalism/canblock-dedicatedworker.html +++ /dev/null @@ -1,13 +0,0 @@ - - -[[CanBlock]] in a dedicated worker agent - - - - - - - diff --git a/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-agent-formalism/canblock-serviceworker.https.html b/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-agent-formalism/canblock-serviceworker.https.html deleted file mode 100644 index 6bfd29e8c74b50..00000000000000 --- a/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-agent-formalism/canblock-serviceworker.https.html +++ /dev/null @@ -1,14 +0,0 @@ - - -[[CanBlock]] in a service worker agent - - - - - - - - diff --git a/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-agent-formalism/canblock-sharedworker.html b/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-agent-formalism/canblock-sharedworker.html deleted file mode 100644 index beb7c6467b2417..00000000000000 --- a/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-agent-formalism/canblock-sharedworker.html +++ /dev/null @@ -1,13 +0,0 @@ - - -[[CanBlock]] in a shared worker agent - - - - - - - diff --git a/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-agent-formalism/canblock-window.html b/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-agent-formalism/canblock-window.html deleted file mode 100644 index 369ce77b0b62af..00000000000000 --- a/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-agent-formalism/canblock-window.html +++ /dev/null @@ -1,21 +0,0 @@ - - -[[CanBlock]] in a similar-origin window agent - - - - - - - diff --git a/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-agent-formalism/worker-that-requires-failure.js b/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-agent-formalism/requires-failure.https.any.js similarity index 79% rename from html/webappapis/scripting/processing-model-2/integration-with-the-javascript-agent-formalism/worker-that-requires-failure.js rename to html/webappapis/scripting/processing-model-2/integration-with-the-javascript-agent-formalism/requires-failure.https.any.js index 586c8ba3876465..2e3cdcb45e861b 100644 --- a/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-agent-formalism/worker-that-requires-failure.js +++ b/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-agent-formalism/requires-failure.https.any.js @@ -1,5 +1,4 @@ -"use strict"; -importScripts("/resources/testharness.js"); +// META: global=!default,window,serviceworker test(() => { const sab = new SharedArrayBuffer(16); diff --git a/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-agent-formalism/worker-that-requires-success.js b/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-agent-formalism/requires-success.any.js similarity index 78% rename from html/webappapis/scripting/processing-model-2/integration-with-the-javascript-agent-formalism/worker-that-requires-success.js rename to html/webappapis/scripting/processing-model-2/integration-with-the-javascript-agent-formalism/requires-success.any.js index 2ed54143ee5572..c564eec19aa1d3 100644 --- a/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-agent-formalism/worker-that-requires-success.js +++ b/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-agent-formalism/requires-success.any.js @@ -1,5 +1,4 @@ -"use strict"; -importScripts("/resources/testharness.js"); +// META: global=!default,dedicatedworker,sharedworker test(() => { const sab = new SharedArrayBuffer(16); From 6fcc32f0ba06a3aa51d162dce5428cfe2c49217e Mon Sep 17 00:00:00 2001 From: Anne van Kesteren Date: Wed, 10 Jul 2019 12:00:24 +0200 Subject: [PATCH 2/2] nits --- .../requires-failure.https.any.js | 2 -- .../requires-success.any.js | 2 -- 2 files changed, 4 deletions(-) diff --git a/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-agent-formalism/requires-failure.https.any.js b/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-agent-formalism/requires-failure.https.any.js index 2e3cdcb45e861b..a890b350198253 100644 --- a/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-agent-formalism/requires-failure.https.any.js +++ b/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-agent-formalism/requires-failure.https.any.js @@ -8,5 +8,3 @@ test(() => { Atomics.wait(ta, 0, 0, 10); }); }, `[[CanBlock]] in a ${self.constructor.name}`); - -done(); diff --git a/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-agent-formalism/requires-success.any.js b/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-agent-formalism/requires-success.any.js index c564eec19aa1d3..290b44353c8ac5 100644 --- a/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-agent-formalism/requires-success.any.js +++ b/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-agent-formalism/requires-success.any.js @@ -6,5 +6,3 @@ test(() => { assert_equals(Atomics.wait(ta, 0, 0, 10), "timed-out"); }, `[[CanBlock]] in a ${self.constructor.name}`); - -done();