Bug 1370203 - Don't require setting the wpt hosts configuration for servo, r=farre
authorJames Graham <james@hoppipolla.co.uk>
Mon, 05 Jun 2017 13:31:08 +0100
changeset 410468 60d3fb7b6810db236778a36f77e277e2c497eb43
parent 410467 ae7d51d0a455bda907d599f7f127c135ad2b3dff
child 410469 bfb69fd3ed936ded13e9b4210ab158b823f99c49
push id7391
push usermtabara@mozilla.com
push dateMon, 12 Jun 2017 13:08:53 +0000
treeherdermozilla-beta@2191d7f87e2e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersfarre
bugs1370203
milestone55.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1370203 - Don't require setting the wpt hosts configuration for servo, r=farre Servo reads the hosts from a file created at runtime, so this configuration isn't required. MozReview-Commit-ID: 20NoZyp3bJz
testing/web-platform/tests/tools/wptrun.py
--- a/testing/web-platform/tests/tools/wptrun.py
+++ b/testing/web-platform/tests/tools/wptrun.py
@@ -76,17 +76,17 @@ your PATH.
 
 Otherwise run with --ssl-type=none""")
             else:
                 raise WptrunError("""OpenSSL not found. If you don't need HTTPS support run with --ssl-type=none,
 otherwise install OpenSSL and ensure that it's on your $PATH.""")
 
 
 def check_environ(product):
-    if product != "firefox":
+    if product not in ("firefox", "servo"):
         expected_hosts = ["web-platform.test",
                           "www.web-platform.test",
                           "www1.web-platform.test",
                           "www2.web-platform.test",
                           "xn--n8j6ds53lwwkrqhv28a.web-platform.test",
                           "xn--lve-6lad.web-platform.test",
                           "nonexistent-origin.web-platform.test"]
         missing_hosts = set(expected_hosts)