Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-05 21:50:18 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #21244 - servo:jdm-patch-23, r=SimonSapin

Browse source 
Adjust import path for WPT tests to accommodate upstream.

This should avoid the ongoing issues where new dependencies are vendored upstream and our setup throws exceptions when some code tries to import them.

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/21244)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2018-07-25 09:02:59 -04:00 • committed by GitHub
commit e6768648a5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
tests/wpt/run.py
View file

@ -22,7 +22,8 @@ def servo_path(*args):
paths = {"include_manifest": wpt_path("include.ini"),
"config": wpt_path("config.ini")}
# Imports
sys.path.append(wpt_path("web-platform-tests", "tools", "wptrunner"))
sys.path.append(wpt_path("web-platform-tests", "tools"))
import localpaths # noqa: flake8
from wptrunner import wptrunner, wptcommandline