From 9ff7de6a449d465936508c718b08b430af8921fa Mon Sep 17 00:00:00 2001
From: Josh Matthews <josh@joshmatthews.net>
Date: Thu, 13 Dec 2018 15:44:56 -0500
Subject: [PATCH 1/2] Disable referrer-policy tests for frequent intermittent
 failures.

---
 tests/wpt/include.ini | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/tests/wpt/include.ini b/tests/wpt/include.ini
index 9219625bfae..5eed5ef7070 100644
--- a/tests/wpt/include.ini
+++ b/tests/wpt/include.ini
@@ -1,6 +1,10 @@
 skip: true
 [_mozilla]
   skip: false
+  [mozilla]
+    skip: false
+    [referrer-policy]
+      skip: true
 [_webgl]
   skip: false
 [2dcontext]
@@ -102,7 +106,7 @@ skip: true
 [quirks]
   skip: false
 [referrer-policy]
-  skip: false
+  skip: true
 [resource-timing]
   skip: false
 [subresource-integrity]

From 8d6fda6ca5cfb9e3f9f95f91fc05e301ab14cee8 Mon Sep 17 00:00:00 2001
From: Josh Matthews <josh@joshmatthews.net>
Date: Thu, 13 Dec 2018 16:19:06 -0500
Subject: [PATCH 2/2] Don't lint subdirectories of virtual manifest paths.

---
 python/tidy/servo_tidy/tidy.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/python/tidy/servo_tidy/tidy.py b/python/tidy/servo_tidy/tidy.py
index 446db50feea..deb86e289c2 100644
--- a/python/tidy/servo_tidy/tidy.py
+++ b/python/tidy/servo_tidy/tidy.py
@@ -489,7 +489,7 @@ def check_manifest_dirs(config_file, print_text=True):
     p = parser.parse(lines)
     paths = rec_parse(wpt_path("web-platform-tests"), p)
     for idx, path in enumerate(paths):
-        if path.endswith("_mozilla") or path.endswith("_webgl"):
+        if '_mozilla' in path or '_webgl' in path:
             continue
         if not os.path.isdir(path):
             yield(config_file, idx + 1, "Path in manifest was not found: {}".format(path))