Bug 1506499 [wpt PR 14017] - Preparation of moving LayoutTests to web_tests., a=testonly
authorKent Tamura <tkent@chromium.org>
Thu, 15 Nov 2018 10:14:25 +0000
changeset 503403 2ac6661b912e72e9b931d87f23d35fc33cff0d0e
parent 503402 b4925f72b3f8259696506c5857d876c237008793
child 503404 66ecc165f23f185e58803c23a373dd386c09d260
push id10290
push userffxbld-merge
push dateMon, 03 Dec 2018 16:23:23 +0000
treeherdermozilla-beta@700bed2445e6 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerstestonly
bugs1506499, 14017, 843412, 1329811, 607165
milestone65.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1506499 [wpt PR 14017] - Preparation of moving LayoutTests to web_tests., a=testonly Automatic update from web-platform-testsPreparation of moving LayoutTests to web_tests. * layout_test_content_browser_client.cc: Pass --tests-in-blink flag to a renderer process. GetWebTestsFilePath() in blink_test_helpers.cc needs this flag. * LayoutTests/editing/assert_selection.html * LayoutTests/editing/assert_selection.js * LayoutTests/editing/execCommand/insert-paragraph-into-table-expected.txt Drop 'LayoutTests/' part from error description * LayoutTests/external/wpt/bluetooth/resources/bluetooth-helpers.js * LayoutTests/external/wpt/webusb/resources/usb-helpers.js Support web_tests/ as well as LayoutTests/ * LayoutTests/fast/js/exception-line-number-expected.txt * LayoutTests/fast/js/script-tests/exception-line-number.js Drop 'LayoutTests/' part from error description Bug: 843412 Change-Id: I817b40bb2e7edf0216a32d9f3a3e2320e4b6956a Reviewed-on: https://chromium-review.googlesource.com/c/1329811 Reviewed-by: Kinuko Yasuda <kinuko@chromium.org> Reviewed-by: Yoshifumi Inoue <yosin@chromium.org> Commit-Queue: Kent Tamura <tkent@chromium.org> Cr-Commit-Position: refs/heads/master@{#607165} -- wpt-commits: fde96a64c643c81649f3abe7768be240264df57f wpt-pr: 14017
testing/web-platform/tests/bluetooth/resources/bluetooth-helpers.js
testing/web-platform/tests/webusb/resources/usb-helpers.js
--- a/testing/web-platform/tests/bluetooth/resources/bluetooth-helpers.js
+++ b/testing/web-platform/tests/bluetooth/resources/bluetooth-helpers.js
@@ -21,18 +21,19 @@ function performChromiumSetup() {
   // Make sure we are actually on Chromium.
   if (!Mojo) {
     return;
   }
 
   // Load the Chromium-specific resources.
   let prefix = '/resources/chromium';
   let extra = [];
-  if (window.location.pathname.includes('/LayoutTests/')) {
-    let root = window.location.pathname.match(/.*LayoutTests/);
+  const pathname = window.location.pathname;
+  if (pathname.includes('/LayoutTests/') || pathname.includes('/web_tests/')) {
+    let root = pathname.match(/.*(?:LayoutTests|web_tests)/);
     prefix = `${root}/external/wpt/resources/chromium`;
     extra = [
       `${root}/resources/bluetooth/bluetooth-fake-adapter.js`,
     ];
   } else if (window.location.pathname.startsWith('/bluetooth/https/')) {
     extra = [
       '/js-test-resources/bluetooth/bluetooth-fake-adapter.js',
     ];
--- a/testing/web-platform/tests/webusb/resources/usb-helpers.js
+++ b/testing/web-platform/tests/webusb/resources/usb-helpers.js
@@ -9,18 +9,19 @@
 //
 //   --enable-blink-features=MojoJS,MojoJSTest
 
 (() => {
   // Load scripts needed by the test API on context creation.
   if ('MojoInterfaceInterceptor' in self) {
     let prefix = '/resources/chromium';
     if ('window' in self) {
-      if (window.location.pathname.includes('/LayoutTests/')) {
-        let root = window.location.pathname.match(/.*LayoutTests/);
+      const pathname = window.location.pathname;
+      if (pathname.includes('/LayoutTests/') || pathname.includes('/web_tests/')) {
+        let root = pathname.match(/.*(?:LayoutTests|web_tests)/);
         prefix = `${root}/external/wpt/resources/chromium`;
       }
     }
     let scriptPath = `${prefix}/webusb-child-test.js`;
     if (typeof document == 'undefined') {
       importScripts(scriptPath);
     } else {
       let script = document.createElement('script');