Added: trunk/LayoutTests/tests-options.json (0 => 205476)
--- trunk/LayoutTests/tests-options.json (rev 0)
+++ trunk/LayoutTests/tests-options.json 2016-09-06 12:30:51 UTC (rev 205476)
@@ -0,0 +1,185 @@
+{
+ "imported/w3c/web-platform-tests/XMLHttpRequest/progress-events-response-data-gzip.htm": [
+ "slow"
+ ],
+ "imported/w3c/web-platform-tests/XMLHttpRequest/send-redirect-bogus.htm": [
+ "slow"
+ ],
+ "imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-timeout-aborted.html": [
+ "slow"
+ ],
+ "imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-timeout-abortedonmain.html": [
+ "slow"
+ ],
+ "imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-timeout-overrides.html": [
+ "slow"
+ ],
+ "imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-timeout-overridesexpires.html": [
+ "slow"
+ ],
+ "imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-timeout-simple.html": [
+ "slow"
+ ],
+ "imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-timeout-synconmain.html": [
+ "slow"
+ ],
+ "imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-timeout-twice.html": [
+ "slow"
+ ],
+ "imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-timeout-worker-aborted.html": [
+ "slow"
+ ],
+ "imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-timeout-worker-overrides.html": [
+ "slow"
+ ],
+ "imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-timeout-worker-overridesexpires.html": [
+ "slow"
+ ],
+ "imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-timeout-worker-simple.html": [
+ "slow"
+ ],
+ "imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-timeout-worker-synconworker.html": [
+ "slow"
+ ],
+ "imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-timeout-worker-twice.html": [
+ "slow"
+ ],
+ "imported/w3c/web-platform-tests/dom/nodes/Document-characterSet-normalization.html": [
+ "slow"
+ ],
+ "imported/w3c/web-platform-tests/dom/ranges/Range-attributes.html": [
+ "slow"
+ ],
+ "imported/w3c/web-platform-tests/dom/ranges/Range-cloneContents.html": [
+ "slow"
+ ],
+ "imported/w3c/web-platform-tests/dom/ranges/Range-cloneRange.html": [
+ "slow"
+ ],
+ "imported/w3c/web-platform-tests/dom/ranges/Range-collapse.html": [
+ "slow"
+ ],
+ "imported/w3c/web-platform-tests/dom/ranges/Range-commonAncestorContainer.html": [
+ "slow"
+ ],
+ "imported/w3c/web-platform-tests/dom/ranges/Range-compareBoundaryPoints.html": [
+ "slow"
+ ],
+ "imported/w3c/web-platform-tests/dom/ranges/Range-comparePoint-2.html": [
+ "slow"
+ ],
+ "imported/w3c/web-platform-tests/dom/ranges/Range-comparePoint.html": [
+ "slow"
+ ],
+ "imported/w3c/web-platform-tests/dom/ranges/Range-deleteContents.html": [
+ "slow"
+ ],
+ "imported/w3c/web-platform-tests/dom/ranges/Range-detach.html": [
+ "slow"
+ ],
+ "imported/w3c/web-platform-tests/dom/ranges/Range-extractContents.html": [
+ "slow"
+ ],
+ "imported/w3c/web-platform-tests/dom/ranges/Range-insertNode.html": [
+ "slow"
+ ],
+ "imported/w3c/web-platform-tests/dom/ranges/Range-intersectsNode-binding.html": [
+ "slow"
+ ],
+ "imported/w3c/web-platform-tests/dom/ranges/Range-intersectsNode.html": [
+ "slow"
+ ],
+ "imported/w3c/web-platform-tests/dom/ranges/Range-isPointInRange.html": [
+ "slow"
+ ],
+ "imported/w3c/web-platform-tests/dom/ranges/Range-mutations.html": [
+ "slow"
+ ],
+ "imported/w3c/web-platform-tests/dom/ranges/Range-selectNode.html": [
+ "slow"
+ ],
+ "imported/w3c/web-platform-tests/dom/ranges/Range-set.html": [
+ "slow"
+ ],
+ "imported/w3c/web-platform-tests/dom/ranges/Range-surroundContents.html": [
+ "slow"
+ ],
+ "imported/w3c/web-platform-tests/dom/traversal/NodeIterator-removal.html": [
+ "slow"
+ ],
+ "imported/w3c/web-platform-tests/dom/traversal/NodeIterator.html": [
+ "slow"
+ ],
+ "imported/w3c/web-platform-tests/dom/traversal/TreeWalker.html": [
+ "slow"
+ ],
+ "imported/w3c/web-platform-tests/fetch/api/request/request-cache.html": [
+ "slow"
+ ],
+ "imported/w3c/web-platform-tests/html/browsers/browsing-the-web/history-traversal/persisted-user-state-restoration/scroll-restoration-fragment-scrolling-cross-origin.html": [
+ "slow"
+ ],
+ "imported/w3c/web-platform-tests/html/browsers/browsing-the-web/history-traversal/persisted-user-state-restoration/scroll-restoration-navigation-cross-origin.html": [
+ "slow"
+ ],
+ "imported/w3c/web-platform-tests/html/browsers/browsing-the-web/scroll-to-fragid/007.html": [
+ "slow"
+ ],
+ "imported/w3c/web-platform-tests/html/browsers/browsing-the-web/scroll-to-fragid/scroll-frag-percent-encoded.html": [
+ "slow"
+ ],
+ "imported/w3c/web-platform-tests/html/browsers/browsing-the-web/scroll-to-fragid/scroll-to-anchor-name.html": [
+ "slow"
+ ],
+ "imported/w3c/web-platform-tests/html/browsers/browsing-the-web/scroll-to-fragid/scroll-to-id-top.html": [
+ "slow"
+ ],
+ "imported/w3c/web-platform-tests/html/browsers/browsing-the-web/scroll-to-fragid/scroll-to-top.html": [
+ "slow"
+ ],
+ "imported/w3c/web-platform-tests/html/browsers/history/the-history-interface/007.html": [
+ "slow"
+ ],
+ "imported/w3c/web-platform-tests/html/browsers/origin/cross-origin-objects/cross-origin-objects.sub.html": [
+ "slow"
+ ],
+ "imported/w3c/web-platform-tests/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/creating_browsing_context_test_01.html": [
+ "slow"
+ ],
+ "imported/w3c/web-platform-tests/html/dom/interfaces.html": [
+ "slow"
+ ],
+ "imported/w3c/web-platform-tests/html/dom/reflection-embedded.html": [
+ "slow"
+ ],
+ "imported/w3c/web-platform-tests/html/dom/reflection-forms.html": [
+ "slow"
+ ],
+ "imported/w3c/web-platform-tests/html/dom/reflection-grouping.html": [
+ "slow"
+ ],
+ "imported/w3c/web-platform-tests/html/dom/reflection-metadata.html": [
+ "slow"
+ ],
+ "imported/w3c/web-platform-tests/html/dom/reflection-misc.html": [
+ "slow"
+ ],
+ "imported/w3c/web-platform-tests/html/dom/reflection-obsolete.html": [
+ "slow"
+ ],
+ "imported/w3c/web-platform-tests/html/dom/reflection-sections.html": [
+ "slow"
+ ],
+ "imported/w3c/web-platform-tests/html/dom/reflection-tabular.html": [
+ "slow"
+ ],
+ "imported/w3c/web-platform-tests/html/dom/reflection-text.html": [
+ "slow"
+ ],
+ "imported/w3c/web-platform-tests/html/semantics/embedded-content/the-img-element/sizes/parse-a-sizes-attribute.html": [
+ "slow"
+ ],
+ "imported/w3c/web-platform-tests/html/semantics/forms/textfieldselection/selection.html": [
+ "slow"
+ ]
+}
Modified: trunk/Tools/Scripts/webkitpy/w3c/test_importer.py (205475 => 205476)
--- trunk/Tools/Scripts/webkitpy/w3c/test_importer.py 2016-09-06 11:28:32 UTC (rev 205475)
+++ trunk/Tools/Scripts/webkitpy/w3c/test_importer.py 2016-09-06 12:30:51 UTC (rev 205476)
@@ -168,7 +168,8 @@
self.destination_directory = webkit_finder.path_from_webkit_base("LayoutTests", options.destination)
self.tests_w3c_relative_path = self.filesystem.join('imported', 'w3c')
- self.layout_tests_w3c_path = webkit_finder.path_from_webkit_base('LayoutTests', self.tests_w3c_relative_path)
+ self.layout_tests_path = webkit_finder.path_from_webkit_base('LayoutTests')
+ self.layout_tests_w3c_path = self.filesystem.join(self.layout_tests_path, self.tests_w3c_relative_path)
self.tests_download_path = webkit_finder.path_from_webkit_base('WebKitBuild', 'w3c-tests')
self._test_downloader = None
@@ -180,8 +181,15 @@
self._test_resource_files_json_path = self.filesystem.join(self.layout_tests_w3c_path, "resources", "resource-files.json")
self._test_resource_files = json.loads(self.filesystem.read_text_file(self._test_resource_files_json_path)) if self.filesystem.exists(self._test_resource_files_json_path) else None
+
+ self._tests_options_json_path = self.filesystem.join(self.layout_tests_path, 'tests-options.json')
+ self._tests_options = json.loads(self.filesystem.read_text_file(self._tests_options_json_path)) if self.filesystem.exists(self._tests_options_json_path) else None
+ self._slow_tests = []
+
if self.options.clean_destination_directory and self._test_resource_files:
self._test_resource_files["files"] = []
+ if self._tests_options:
+ self.remove_slow_from_w3c_tests_options()
def do_import(self):
if not self.source_directory:
@@ -305,6 +313,9 @@
elif self._is_in_resources_directory(fullpath):
_log.warning('%s is a test located in a "resources" folder. This test will be skipped by WebKit test runners.', fullpath)
+ if 'slow' in test_info:
+ self._slow_tests.append(fullpath)
+
if 'manualtest' in test_info.keys():
continue
@@ -480,6 +491,9 @@
files.sort()
self.filesystem.write_text_file(self._test_resource_files_json_path, json.dumps(self._test_resource_files, sort_keys=True, indent=4).replace(' \n', '\n'))
+ if self._tests_options:
+ self.update_tests_options()
+
def _already_identified_as_resource_file(self, path):
if path in self._test_resource_files["files"]:
return True
@@ -488,6 +502,32 @@
def _is_in_resources_directory(self, path):
return "resources" in path.split(self.filesystem.sep)
+ def update_tests_options(self):
+ should_update = self.options.clean_destination_directory
+ for full_path in self._slow_tests:
+ w3c_test_path = self.filesystem.relpath(full_path, self.source_directory)
+ # No need to mark tests as slow if they are in skipped directories
+ if self._already_identified_as_resource_file(w3c_test_path):
+ continue
+
+ test_path = self.filesystem.join(self.tests_w3c_relative_path, w3c_test_path)
+ options = self._tests_options.get(test_path, [])
+ if not 'slow' in options:
+ options.append('slow')
+ self._tests_options[test_path] = options
+ should_update = True
+
+ if should_update:
+ self.filesystem.write_text_file(self._tests_options_json_path, json.dumps(self._tests_options, sort_keys=True, indent=4).replace(' \n', '\n'))
+
+ def remove_slow_from_w3c_tests_options(self):
+ for test_path in self._tests_options.keys():
+ if self.tests_w3c_relative_path in test_path:
+ options = self._tests_options[test_path]
+ options.remove('slow')
+ if not options:
+ self._tests_options.pop(test_path)
+
def remove_deleted_files(self, import_directory, new_file_list):
""" Reads an import log in |import_directory|, compares it to the |new_file_list|, and removes files not in the new list."""
Modified: trunk/Tools/Scripts/webkitpy/w3c/test_parser.py (205475 => 205476)
--- trunk/Tools/Scripts/webkitpy/w3c/test_parser.py 2016-09-06 11:28:32 UTC (rev 205475)
+++ trunk/Tools/Scripts/webkitpy/w3c/test_parser.py 2016-09-06 12:30:51 UTC (rev 205476)
@@ -125,6 +125,9 @@
elif self.options['all'] is True:
test_info = {'test': self.filename}
+ if test_info and self.is_slow_test():
+ test_info['slow'] = True
+
return test_info
def reference_links_of_type(self, reftest_type):
@@ -138,9 +141,12 @@
"""Returns whether the test is a manual test according WPT rules (i.e. file ends with -manual.htm path)."""
return self.filename.endswith('-manual.htm') or self.filename.endswith('-manual.html')
+ def is_slow_test(self):
+ return any([match.name == 'meta' and match['name'] == 'timeout' for match in self.test_doc.findAll(content='long')])
+
def potential_ref_filename(self):
parts = self.filesystem.splitext(self.filename)
- return parts[0] + '-ref' + parts[1]
+ return parts[0] + '-ref' + parts[1]
def is_wpt_reftest(self):
"""Returns whether the test is a ref test according WPT rules (i.e. file has a -ref.html counterpart)."""
