1797903 - [wpt-sync] Sync PR 36704 - Revert "[wptrunner] Consume wptserve config"

Status: RESOLVED INVALID

(Testing :: web-platform-tests, task, P4)

Description

[Web Platform Test Sync Bot [:wpt-sync] (Matrix: #interop:mozilla.org)]

Sync web-platform-tests PR 36704 into mozilla-central (this bug is closed when the sync is complete).

PR: https://github.com/web-platform-tests/wpt/pull/36704
Details from upstream follow.

Weizhong Xia <[e-mail]> wrote:

Revert "[wptrunner] Consume wptserve config"

This reverts commit 7687ce10bad98f8550ad98fc7862bcd38ede7118.

Reason for revert: crbug.com/1379151

Original change's description:

[wptrunner] Consume wptserve config

Currently, run_web_tests.py invokes wpt serve --config=... to apply
Blink-specific overrides from //third_party/wpt_tools/wpt.config.json.
However, this is a nonstandard location for this file; wptrunner expects
this file to exist at the test root corresponding to the / URL prefix
with the name config.json:
https://github.com/web-platform-tests/wpt/pull/36656#issuecomment-1292443696

This change moves the file to the standard location, updates any stale
references to the old location, and blocks the WPT exporter from
upstreaming this Blink-specific file. bluetooth/ tests that previously
failed in wptrunner because they could not load
web_tests/resources/testdriver-vendor.js should now pass.

Test: run_{blink_web_tests,wpt_tests_isolate_content_shell}
Test: -t Default external/wpt/bluetooth/adapter
Test: third_party/wpt_tools/update_certs.py
Cq-Include-Trybots: luci.chromium.try:linux-wpt-content-shell-fyi-rel
Bug: 1378043
Change-Id: I457ab68e38071c348a442558a8a6a48b593fc2f5
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3984351
Reviewed-by: Mike West <[e-mail]>
Commit-Queue: Jonathan Lee <[e-mail]>
Reviewed-by: Weizhong Xia <[e-mail]>
Cr-Commit-Position: refs/heads/main@{#1064403}

Bug: 1378043
Change-Id: Icfe14a670a42ac423591888bfd02463e782341f5
Cq-Include-Trybots: luci.chromium.try:linux-wpt-content-shell-fyi-rel
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3989255