Reland "[wptrunner] Consume wptserve config"
This is a reland of commit 7687ce10bad98f8550ad98fc7862bcd38ede7118
Changes from original:
Include missing `external/wpt/config.json` for all targets that depend
on wptserve:
https://source.chromium.org/search?q=%2F%2Fthird_party%2Fwpt_tools%2F%20lang:gn
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 <[email protected]>
> Commit-Queue: Jonathan Lee <[email protected]>
> Reviewed-by: Weizhong Xia <[email protected]>
> Cr-Commit-Position: refs/heads/main@{#1064403}
Bug: 1378043
Change-Id: Ibe6b490f493ba3a6b66a81ddb41889284e701b1d
Cq-Include-Trybots: luci.chromium.try:linux-wpt-content-shell-fyi-rel
Cq-Include-Trybots: luci.chromium.try:linux-blink-rel
Cq-Include-Trybots: luci.chromium.try:dawn-linux-x64-deps-rel
Cq-Include-Trybots: luci.chromium.try:win_optional_gpu_tests_rel
No-Export: true
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3995408
Reviewed-by: Mike West <[email protected]>
Reviewed-by: Dirk Pranke <[email protected]>
Reviewed-by: Weizhong Xia <[email protected]>
Commit-Queue: Jonathan Lee <[email protected]>
Cr-Commit-Position: refs/heads/main@{#1069883}
diff --git a/BUILD.gn b/BUILD.gn
index 1671df5..0acf283 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -1135,6 +1135,7 @@
"//chrome/test/chromedriver/test/run_webdriver_tests.py",
"//chrome/test/chromedriver/util.py",
"//third_party/blink/tools/blinkpy/",
+ "//third_party/blink/web_tests/external/wpt/config.json",
"//third_party/blink/web_tests/external/wpt/webdriver/",
"//third_party/blink/web_tests/VirtualTestSuites",
"//third_party/blink/web_tests/WebDriverExpectations",
@@ -1243,6 +1244,7 @@
"//testing/scripts/run_isolated_script_test.py",
"//testing/xvfb.py",
"//third_party/blink/tools/",
+ "//third_party/blink/web_tests/external/wpt/config.json",
"//third_party/blink/web_tests/resources/",
"//third_party/pywebsocket3/src/mod_pywebsocket/",
"//third_party/test_fonts/test_fonts/",
