From c3cedeee4557cd777c03f230fdf7de844a8b983e Mon Sep 17 00:00:00 2001
From: Josh Matthews <josh@joshmatthews.net>
Date: Thu, 5 Oct 2017 07:38:38 -0500
Subject: [PATCH] servo: Merge #18756 - Update web-platform-tests (from
 servo:wptup); r=jgraham

This updates web-platform-tests to a46616a5b18e. It also removes our local copy of wptrunner in favour of the upstream one that we can modify and sync more easily. Carried from #17416.

Source-Repo: https://github.com/servo/servo
Source-Revision: 139055fca32de5e5a30161112752294770bdf67f

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 392d9af86455d0a0db5eb895f4fb4b0e59d63e71
---
 servo/python/mach_bootstrap.py        |  2 +-
 servo/python/servo/devenv_commands.py | 26 --------------------------
 2 files changed, 1 insertion(+), 27 deletions(-)

diff --git a/servo/python/mach_bootstrap.py b/servo/python/mach_bootstrap.py
index f34689993a79..889a63f312c4 100644
--- a/servo/python/mach_bootstrap.py
+++ b/servo/python/mach_bootstrap.py
@@ -115,7 +115,7 @@ def wpt_harness_path(is_firefox, topdir, *paths):
     if is_firefox:
         rel = os.path.join(wpt_root, "tests", "tools", "wptrunner")
     else:
-        rel = os.path.join(wpt_root, "harness")
+        rel = os.path.join(wpt_root, "web-platform-tests", "tools", "wptrunner")
 
     return os.path.join(topdir, rel, *paths)
 
diff --git a/servo/python/servo/devenv_commands.py b/servo/python/servo/devenv_commands.py
index 804e7e1c425a..49fe355c54bd 100644
--- a/servo/python/servo/devenv_commands.py
+++ b/servo/python/servo/devenv_commands.py
@@ -285,29 +285,3 @@ class MachCommands(CommandBase):
         # Fetch Cargo dependencies
         with cd(self.context.topdir):
             call(["cargo", "fetch"], env=self.build_env())
-
-    @Command('wptrunner-upgrade',
-             description='upgrade wptrunner.',
-             category='devenv')
-    def upgrade_wpt_runner(self):
-        env = self.build_env()
-        with cd(path.join(self.context.topdir, 'tests', 'wpt', 'harness')):
-            code = call(["git", "init"], env=env)
-            if code:
-                return code
-            # No need to report an error if this fails, as it will for the first use
-            call(["git", "remote", "rm", "upstream"], env=env)
-            code = call(
-                ["git", "remote", "add", "upstream", "https://github.com/w3c/wptrunner.git"], env=env)
-            if code:
-                return code
-            code = call(["git", "fetch", "upstream"], env=env)
-            if code:
-                return code
-            code = call(["git", "reset", "--hard", "remotes/upstream/master"], env=env)
-            if code:
-                return code
-            code = call(["rm", "-rf", ".git"], env=env)
-            if code:
-                return code
-            return 0