[wptrunner] Do not include testharness{,report}.js twice (web-platf…

…orm-tests#43984) Injecting `<script src="/resources/testharness{,report}.js">` is an implicit behavior of `wptserve` for `.js` files [0]. Including `testharnessreport.js` twice for `content_shell` appears benign, but causes issues for the default WebDriver testharness implementation. Exporting this change will enable useful coverage for such browsers. A follow-up PR upstream will have `wpt lint` ban such duplicate scripts. [0]: https://github.com/web-platform-tests/wpt/blob/9e0d5be/tools/serve/serve.py#L273-L451 Bug: 1518022 Change-Id: I7a6e344c82bbaa33adfa578feeb966fa92f08040 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5195267 Commit-Queue: Jonathan Lee <[email protected]> Reviewed-by: Weizhong Xia <[email protected]> Cr-Commit-Position: refs/heads/main@{#1247652} Co-authored-by: Jonathan Lee <[email protected]>
Tobias710219 · Jan 16, 2024 · f66439a · f66439a
1 parent 3763aff
commit f66439a
Show file tree

Hide file tree

Showing 28 changed files with 2 additions and 61 deletions.
diff --git a/fetch/api/basic/keepalive.any.js b/fetch/api/basic/keepalive.any.js
@@ -1,7 +1,6 @@
 // META: global=window
+// META: timeout=long
 // META: title=Fetch API: keepalive handling
-// META: script=/resources/testharness.js
-// META: script=/resources/testharnessreport.js
 // META: script=/common/utils.js
 // META: script=/common/get-host-info.sub.js
 // META: script=../resources/keepalive-helper.js

diff --git a/fetch/api/cors/cors-keepalive.any.js b/fetch/api/cors/cors-keepalive.any.js
@@ -1,8 +1,6 @@
 // META: global=window
 // META: timeout=long
 // META: title=Fetch API: keepalive handling
-// META: script=/resources/testharness.js
-// META: script=/resources/testharnessreport.js
 // META: script=/common/utils.js
 // META: script=/common/get-host-info.sub.js
 // META: script=../resources/keepalive-helper.js

diff --git a/fetch/api/redirect/redirect-keepalive.any.js b/fetch/api/redirect/redirect-keepalive.any.js
@@ -1,7 +1,6 @@
 // META: global=window
+// META: timeout=long
 // META: title=Fetch API: keepalive handling
-// META: script=/resources/testharness.js
-// META: script=/resources/testharnessreport.js
 // META: script=/common/utils.js
 // META: script=/common/get-host-info.sub.js
 // META: script=../resources/keepalive-helper.js

diff --git a/fetch/api/redirect/redirect-keepalive.https.any.js b/fetch/api/redirect/redirect-keepalive.https.any.js
@@ -1,7 +1,5 @@
 // META: global=window
 // META: title=Fetch API: keepalive handling
-// META: script=/resources/testharness.js
-// META: script=/resources/testharnessreport.js
 // META: script=/common/utils.js
 // META: script=/common/get-host-info.sub.js
 // META: script=../resources/keepalive-helper.js

diff --git a/fetch/fetch-later/activate-after.tentative.https.window.js b/fetch/fetch-later/activate-after.tentative.https.window.js
@@ -1,5 +1,3 @@
-// META: script=/resources/testharness.js
-// META: script=/resources/testharnessreport.js
 // META: script=/common/dispatcher/dispatcher.js
 // META: script=/common/get-host-info.sub.js
 // META: script=/common/utils.js

diff --git a/fetch/fetch-later/basic.tentative.https.window.js b/fetch/fetch-later/basic.tentative.https.window.js
@@ -1,6 +1,3 @@
-// META: script=/resources/testharness.js
-// META: script=/resources/testharnessreport.js
-
 'use strict';
 
 test(() => {

diff --git a/fetch/fetch-later/iframe.tentative.https.window.js b/fetch/fetch-later/iframe.tentative.https.window.js
@@ -1,5 +1,3 @@
-// META: script=/resources/testharness.js
-// META: script=/resources/testharnessreport.js
 // META: script=/common/utils.js
 // META: script=/common/get-host-info.sub.js
 // META: script=/pending-beacon/resources/pending_beacon-helper.js

diff --git a/fetch/fetch-later/new-window.tentative.https.window.js b/fetch/fetch-later/new-window.tentative.https.window.js
@@ -1,5 +1,3 @@
-// META: script=/resources/testharness.js
-// META: script=/resources/testharnessreport.js
 // META: script=/common/utils.js
 // META: script=/common/get-host-info.sub.js
 // META: script=/pending-beacon/resources/pending_beacon-helper.js

diff --git a/fetch/fetch-later/non-secure.window.js b/fetch/fetch-later/non-secure.window.js
@@ -1,6 +1,3 @@
-// META: script=/resources/testharness.js
-// META: script=/resources/testharnessreport.js
-
 'use strict';
 
 test(() => {

diff --git a/fetch/fetch-later/policies/csp-allowed.tentative.https.window.js b/fetch/fetch-later/policies/csp-allowed.tentative.https.window.js
@@ -1,6 +1,4 @@
 // META: title=FetchLater: allowed by CSP
-// META: script=/resources/testharness.js
-// META: script=/resources/testharnessreport.js
 // META: script=/common/utils.js
 // META: script=/common/get-host-info.sub.js
 // META: script=/pending-beacon/resources/pending_beacon-helper.js

diff --git a/fetch/fetch-later/policies/csp-blocked.tentative.https.window.js b/fetch/fetch-later/policies/csp-blocked.tentative.https.window.js
@@ -1,6 +1,4 @@
 // META: title=FetchLater: blocked by CSP
-// META: script=/resources/testharness.js
-// META: script=/resources/testharnessreport.js
 // META: script=/common/utils.js
 // META: script=/common/get-host-info.sub.js
 // META: script=/pending-beacon/resources/pending_beacon-helper.js

diff --git a/fetch/fetch-later/policies/csp-redirect-to-blocked.tentative.https.window.js b/fetch/fetch-later/policies/csp-redirect-to-blocked.tentative.https.window.js
@@ -1,6 +1,4 @@
 // META: title=FetchLater: redirect blocked by CSP
-// META: script=/resources/testharness.js
-// META: script=/resources/testharnessreport.js
 // META: script=/common/utils.js
 // META: script=/common/get-host-info.sub.js
 // META: script=/pending-beacon/resources/pending_beacon-helper.js

diff --git a/fetch/fetch-later/quota.tentative.https.window.js b/fetch/fetch-later/quota.tentative.https.window.js
@@ -1,5 +1,3 @@
-// META: script=/resources/testharness.js
-// META: script=/resources/testharnessreport.js
 // META: script=/common/get-host-info.sub.js
 // META: script=/common/utils.js
 // META: script=/pending-beacon/resources/pending_beacon-helper.js

diff --git a/fetch/fetch-later/send-on-deactivate.tentative.https.window.js b/fetch/fetch-later/send-on-deactivate.tentative.https.window.js
@@ -1,5 +1,3 @@
-// META: script=/resources/testharness.js
-// META: script=/resources/testharnessreport.js
 // META: script=/common/dispatcher/dispatcher.js
 // META: script=/common/get-host-info.sub.js
 // META: script=/common/utils.js

diff --git a/fetch/fetch-later/send-on-discard/not-send-after-abort.tentative.https.window.js b/fetch/fetch-later/send-on-discard/not-send-after-abort.tentative.https.window.js
@@ -1,5 +1,3 @@
-// META: script=/resources/testharness.js
-// META: script=/resources/testharnessreport.js
 // META: script=/common/utils.js
 // META: script=/pending-beacon/resources/pending_beacon-helper.js
 

diff --git a/...h/fetch-later/send-on-discard/send-multiple-with-activate-after.tentative.https.window.js b/...h/fetch-later/send-on-discard/send-multiple-with-activate-after.tentative.https.window.js
@@ -1,5 +1,3 @@
-// META: script=/resources/testharness.js
-// META: script=/resources/testharnessreport.js
 // META: script=/common/utils.js
 // META: script=/pending-beacon/resources/pending_beacon-helper.js
 // META: timeout=long

diff --git a/fetch/fetch-later/send-on-discard/send-multiple.tentative.https.window.js b/fetch/fetch-later/send-on-discard/send-multiple.tentative.https.window.js
@@ -1,5 +1,3 @@
-// META: script=/resources/testharness.js
-// META: script=/resources/testharnessreport.js
 // META: script=/common/utils.js
 // META: script=/pending-beacon/resources/pending_beacon-helper.js
 // META: timeout=long

diff --git a/.../semantics/embedded-content/the-iframe-element/resources/sandbox-top-navigation-helper.js b/.../semantics/embedded-content/the-iframe-element/resources/sandbox-top-navigation-helper.js
@@ -4,8 +4,6 @@
 // // META: script=/common/utils.js
 // // META: script=/resources/testdriver.js
 // // META: script=/resources/testdriver-vendor.js
-// // META: script=/resources/testharness.js
-// // META: script=/resources/testharnessreport.js
 // // META: script=/html/browsers/browsing-the-web/remote-context-helper/resources/remote-context-helper.js
 // // META: script=./resources/sandbox-top-navigation-helper.js
 

diff --git a/...ent/the-iframe-element/sandbox-top-navigation-child-special-cases.tentative.sub.window.js b/...ent/the-iframe-element/sandbox-top-navigation-child-special-cases.tentative.sub.window.js
@@ -4,8 +4,6 @@
 // META: script=/common/utils.js
 // META: script=/resources/testdriver.js
 // META: script=/resources/testdriver-vendor.js
-// META: script=/resources/testharness.js
-// META: script=/resources/testharnessreport.js
 // META: script=/html/browsers/browsing-the-web/remote-context-helper/resources/remote-context-helper.js
 // META: script=./resources/sandbox-top-navigation-helper.js
 

diff --git a/.../embedded-content/the-iframe-element/sandbox-top-navigation-child.tentative.sub.window.js b/.../embedded-content/the-iframe-element/sandbox-top-navigation-child.tentative.sub.window.js
@@ -4,8 +4,6 @@
 // META: script=/common/utils.js
 // META: script=/resources/testdriver.js
 // META: script=/resources/testdriver-vendor.js
-// META: script=/resources/testharness.js
-// META: script=/resources/testharnessreport.js
 // META: script=/html/browsers/browsing-the-web/remote-context-helper/resources/remote-context-helper.js
 // META: script=./resources/sandbox-top-navigation-helper.js
 

diff --git a/...ent/the-iframe-element/sandbox-top-navigation-escalate-privileges.tentative.sub.window.js b/...ent/the-iframe-element/sandbox-top-navigation-escalate-privileges.tentative.sub.window.js
@@ -4,8 +4,6 @@
 // META: script=/common/utils.js
 // META: script=/resources/testdriver.js
 // META: script=/resources/testdriver-vendor.js
-// META: script=/resources/testharness.js
-// META: script=/resources/testharnessreport.js
 // META: script=/html/browsers/browsing-the-web/remote-context-helper/resources/remote-context-helper.js
 // META: script=./resources/sandbox-top-navigation-helper.js
 

diff --git a/...dded-content/the-iframe-element/sandbox-top-navigation-grandchild.tentative.sub.window.js b/...dded-content/the-iframe-element/sandbox-top-navigation-grandchild.tentative.sub.window.js
@@ -4,8 +4,6 @@
 // META: script=/common/utils.js
 // META: script=/resources/testdriver.js
 // META: script=/resources/testdriver-vendor.js
-// META: script=/resources/testharness.js
-// META: script=/resources/testharnessreport.js
 // META: script=/html/browsers/browsing-the-web/remote-context-helper/resources/remote-context-helper.js
 // META: script=./resources/sandbox-top-navigation-helper.js
 

diff --git a/pending-beacon/pending_beacon-basic.window.js b/pending-beacon/pending_beacon-basic.window.js
@@ -1,6 +1,3 @@
-// META: script=/resources/testharness.js
-// META: script=/resources/testharnessreport.js
-
 'use strict';
 
 test(() => {

diff --git a/pending-beacon/pending_beacon-sendondiscard.tentative.https.window.js b/pending-beacon/pending_beacon-sendondiscard.tentative.https.window.js
@@ -1,5 +1,3 @@
-// META: script=/resources/testharness.js
-// META: script=/resources/testharnessreport.js
 // META: script=/common/utils.js
 // META: script=./resources/pending_beacon-helper.js
 

diff --git a/pending-beacon/pending_beacon-sendonhidden.tentative.https.window.js b/pending-beacon/pending_beacon-sendonhidden.tentative.https.window.js
@@ -1,5 +1,3 @@
-// META: script=/resources/testharness.js
-// META: script=/resources/testharnessreport.js
 // META: script=/common/dispatcher/dispatcher.js
 // META: script=/common/get-host-info.sub.js
 // META: script=/common/utils.js

diff --git a/shape-detection/detection-ImageDataUint16StorageFormat.https.window.js b/shape-detection/detection-ImageDataUint16StorageFormat.https.window.js
@@ -1,5 +1,3 @@
-// META: script=/resources/testharness.js
-// META: script=/resources/testharnessreport.js
 // META: script=/shape-detection/resources/shapedetection-helpers.js
 
 const imgUint16 = new ImageData(1024, 1024, {storageFormat: 'uint16'});

diff --git a/...audio-api/the-audiocontext-interface/audiocontext-state-change-after-close.http.window.js b/...audio-api/the-audiocontext-interface/audiocontext-state-change-after-close.http.window.js
@@ -1,6 +1,3 @@
-// META: script=/resources/testharness.js
-// META: script=/resources/testharnessreport.js
-
 'use strict';
 
 promise_test(async t => {

diff --git a/webaudio/the-audio-api/the-audioparam-interface/audioparam-default-value.window.js b/webaudio/the-audio-api/the-audioparam-interface/audioparam-default-value.window.js
@@ -1,6 +1,3 @@
-// META: script=/resources/testharness.js
-// META: script=/resources/testharnessreport.js
-
 'use strict';
 
 test(() => {