aboutsummaryrefslogtreecommitdiffstats
path: root/tests/wpt/web-platform-tests/mixed-content/generic/tools/common_paths.py
diff options
context:
space:
mode:
authorJosh Matthews <josh@joshmatthews.net>2017-10-30 09:31:22 -0400
committerJosh Matthews <josh@joshmatthews.net>2017-10-30 18:26:08 -0400
commit75736751d9ffa1489c67387b89b79d7ebd06611c (patch)
treeda615fa4454d45743b6fe656d3fc9a1643695158 /tests/wpt/web-platform-tests/mixed-content/generic/tools/common_paths.py
parent1b73cf33525afbbe2d077554d1965b74ef9ae5e3 (diff)
downloadservo-75736751d9ffa1489c67387b89b79d7ebd06611c.tar.gz
servo-75736751d9ffa1489c67387b89b79d7ebd06611c.zip
Update web-platform-tests to revision 14cfa4d648cc1c853b4153268df672d21425f8c1
Diffstat (limited to 'tests/wpt/web-platform-tests/mixed-content/generic/tools/common_paths.py')
-rw-r--r--tests/wpt/web-platform-tests/mixed-content/generic/tools/common_paths.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/tests/wpt/web-platform-tests/mixed-content/generic/tools/common_paths.py b/tests/wpt/web-platform-tests/mixed-content/generic/tools/common_paths.py
index 5c2807d2834..0bf41f2d1c6 100644
--- a/tests/wpt/web-platform-tests/mixed-content/generic/tools/common_paths.py
+++ b/tests/wpt/web-platform-tests/mixed-content/generic/tools/common_paths.py
@@ -13,13 +13,14 @@ test_root_directory = os.path.abspath(os.path.join(script_directory,
spec_filename = os.path.join(spec_directory, "spec.src.json")
generated_spec_json_filename = os.path.join(spec_directory, "spec_json.js")
-selection_pattern = '%(opt_in_method)s/' + \
+selection_pattern = '%(subresource)s/' + \
+ '%(opt_in_method)s/' + \
'%(origin)s/' + \
- '%(subresource)s/' + \
'%(context_nesting)s/' + \
'%(redirection)s/'
-test_file_path_pattern = '%(spec_name)s/' + selection_pattern + \
+test_file_path_pattern = selection_pattern + \
+ '%(spec_name)s/' + \
'%(name)s.%(source_scheme)s.html'