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
This commit is contained in:
Josh Matthews
2017-10-05 07:38:38 -05:00
parent cd9eff3df7
commit 5ca5c3b9f1
2 changed files with 1 additions and 27 deletions

View File

@@ -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)