wptserve: Support wpt_automation

third_party/WebKit/LayoutTests/resources/testharnessreport.js

Index: third_party/WebKit/LayoutTests/resources/testharnessreport.js
diff --git a/third_party/WebKit/LayoutTests/resources/testharnessreport.js b/third_party/WebKit/LayoutTests/resources/testharnessreport.js
index 5a90ebcbdf09e845fd1460421dd49626d029a1e7..da58d62d61a1feee380f352195c7cc8b6e7354a1 100644
--- a/third_party/WebKit/LayoutTests/resources/testharnessreport.js
+++ b/third_party/WebKit/LayoutTests/resources/testharnessreport.js
@@ -81,12 +81,32 @@
 
     function isWPTManualTest() {
         var path = location.pathname;
+        if (location.hostname == 'web-platform.test' && path.endsWith('-manual.html'))
+            return true;
         return /\/imported\/wpt\/.*-manual\.html$/.test(path);
     }
 
+    // Returns a directory part relative to WPT root and a basename part of the
+    // current test. e.g.
+    // Current test: file:///.../LayoutTests/imported/wpt/pointerevents/foobar.html
+    // Output: "/pointerevents/foobar"
+    function pathAndBaseNameInWPT() {
+        var path = location.pathname;
+        if (location.hostname == 'web-platform.test') {
+            var matches = path.match(/^(\/.*)\.html$/);
+            return matches ? matches[1] : null;
+        }
+        var matches = path.match(/imported\/wpt(\/.*)\.html$/);
+        return matches ? matches[1] : null;
+    }
+
     function loadAutomationScript() {
-        var testPath = location.pathname;
-        var automationPath = testPath.replace(/\/imported\/wpt\/.*$/, '/imported/wpt_automation');
+        var pathAndBase = pathAndBaseNameInWPT();
+        if (!pathAndBase)
+            return;
+        var automationPath = location.pathname.replace(/\/imported\/wpt\/.*$/, '/imported/wpt_automation');
+        if (location.hostname == 'web-platform.test')
+            automationPath = '/wpt_automation';
 
         // Export importAutomationScript for use by the automation scripts.
         window.importAutomationScript = function(relativePath) {
@@ -96,13 +116,13 @@
         }
 
         var src;
-        if (testPath.includes('/imported/wpt/fullscreen/')) {
+        if (pathAndBase.startsWith('/fullscreen/')) {
             // Fullscreen tests all use the same automation script.
             src = automationPath + '/fullscreen/auto-click.js';
-        } else if (testPath.includes('/imported/wpt/pointerevents/')
-                   || testPath.includes('/imported/wpt/uievents/')) {
+        } else if (pathAndBase.startsWith('/pointerevents/')
+                   || pathAndBase.startsWith('/uievents/')) {
             // Per-test automation scripts.
-            src = testPath.replace(/\/imported\/wpt\/(.*)\.html$/, "/imported/wpt_automation/$1-automation.js");
+            src = automationPath + pathAndBase + '-automation.js';
         } else {
             return;
         }