Use upstream wptrunner from web-platform-tests.

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)
 

python/servo/devenv_commands.py

@@ -285,29 +285,3 @@ def fetch(self):
         # 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

tests/wpt/README.md

@@ -186,20 +186,6 @@ This should create two commits in your servo repository with the
 updated tests and updated metadata. The same process works for the
 CSSWG tests, using the `update-css` and `test-css` mach commands.
 
-Updating the test harness
-=========================
-
-The easiest way to update the test harness is using git:
-
-    cd tests/wpt/harness
-    git init .
-    git remote add origin https://github.com/w3c/wptrunner
-    git fetch origin
-    git checkout -f origin/master
-    cd ../../..
-
-At this point you should commit the updated files in the *servo* git repository.
-
 Servo-specific tests
 ====================