<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[205476] trunk</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/205476">205476</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-09-06 05:30:51 -0700 (Tue, 06 Sep 2016)</dd>
</dl>

<h3>Log Message</h3>
<pre>W3C test importer should be able to identify slow test
https://bugs.webkit.org/show_bug.cgi?id=161601

Patch by Youenn Fablet &lt;youenn@apple.com&gt; on 2016-09-06
Reviewed by Darin Adler.

Tools:

Test parser is now identifying slow tests based on &quot;meta element name=timeout content=long&quot; elements.
Test importer is updating test-options.json file according that information.

In case of clean import, the test-options.json is cleaned from 'slow' options for all W3C tests.

* Scripts/webkitpy/w3c/test_importer.py:
(TestImporter.__init__):
(TestImporter.find_importable_tests):
(TestImporter.import_tests):
(TestImporter.update_test_options):
(TestImporter):
(TestImporter.remove_slow_from_w3c_test_options):
* Scripts/webkitpy/w3c/test_parser.py:
(TestParser.analyze_test):
(TestParser.is_slow_test):
(TestParser.potential_ref_filename):

LayoutTests:

* tests-options.json: Added.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptswebkitpyw3ctest_importerpy">trunk/Tools/Scripts/webkitpy/w3c/test_importer.py</a></li>
<li><a href="#trunkToolsScriptswebkitpyw3ctest_parserpy">trunk/Tools/Scripts/webkitpy/w3c/test_parser.py</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTeststestsoptionsjson">trunk/LayoutTests/tests-options.json</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (205475 => 205476)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2016-09-06 11:28:32 UTC (rev 205475)
+++ trunk/LayoutTests/ChangeLog        2016-09-06 12:30:51 UTC (rev 205476)
</span><span class="lines">@@ -1,5 +1,14 @@
</span><span class="cx"> 2016-09-06  Youenn Fablet  &lt;youenn@apple.com&gt;
</span><span class="cx"> 
</span><ins>+        W3C test importer should be able to identify slow test
+        https://bugs.webkit.org/show_bug.cgi?id=161601
+
+        Reviewed by Darin Adler.
+
+        * tests-options.json: Added.
+
+2016-09-06  Youenn Fablet  &lt;youenn@apple.com&gt;
+
</ins><span class="cx">         CachedResourceLoader is not taking into account fetch options to use or not cached resources
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=161389
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkLayoutTeststestsoptionsjson"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/tests-options.json (0 => 205476)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/tests-options.json                                (rev 0)
+++ trunk/LayoutTests/tests-options.json        2016-09-06 12:30:51 UTC (rev 205476)
</span><span class="lines">@@ -0,0 +1,185 @@
</span><ins>+{
+    &quot;imported/w3c/web-platform-tests/XMLHttpRequest/progress-events-response-data-gzip.htm&quot;: [
+        &quot;slow&quot;
+    ],
+    &quot;imported/w3c/web-platform-tests/XMLHttpRequest/send-redirect-bogus.htm&quot;: [
+        &quot;slow&quot;
+    ],
+    &quot;imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-timeout-aborted.html&quot;: [
+        &quot;slow&quot;
+    ],
+    &quot;imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-timeout-abortedonmain.html&quot;: [
+        &quot;slow&quot;
+    ],
+    &quot;imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-timeout-overrides.html&quot;: [
+        &quot;slow&quot;
+    ],
+    &quot;imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-timeout-overridesexpires.html&quot;: [
+        &quot;slow&quot;
+    ],
+    &quot;imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-timeout-simple.html&quot;: [
+        &quot;slow&quot;
+    ],
+    &quot;imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-timeout-synconmain.html&quot;: [
+        &quot;slow&quot;
+    ],
+    &quot;imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-timeout-twice.html&quot;: [
+        &quot;slow&quot;
+    ],
+    &quot;imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-timeout-worker-aborted.html&quot;: [
+        &quot;slow&quot;
+    ],
+    &quot;imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-timeout-worker-overrides.html&quot;: [
+        &quot;slow&quot;
+    ],
+    &quot;imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-timeout-worker-overridesexpires.html&quot;: [
+        &quot;slow&quot;
+    ],
+    &quot;imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-timeout-worker-simple.html&quot;: [
+        &quot;slow&quot;
+    ],
+    &quot;imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-timeout-worker-synconworker.html&quot;: [
+        &quot;slow&quot;
+    ],
+    &quot;imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-timeout-worker-twice.html&quot;: [
+        &quot;slow&quot;
+    ],
+    &quot;imported/w3c/web-platform-tests/dom/nodes/Document-characterSet-normalization.html&quot;: [
+        &quot;slow&quot;
+    ],
+    &quot;imported/w3c/web-platform-tests/dom/ranges/Range-attributes.html&quot;: [
+        &quot;slow&quot;
+    ],
+    &quot;imported/w3c/web-platform-tests/dom/ranges/Range-cloneContents.html&quot;: [
+        &quot;slow&quot;
+    ],
+    &quot;imported/w3c/web-platform-tests/dom/ranges/Range-cloneRange.html&quot;: [
+        &quot;slow&quot;
+    ],
+    &quot;imported/w3c/web-platform-tests/dom/ranges/Range-collapse.html&quot;: [
+        &quot;slow&quot;
+    ],
+    &quot;imported/w3c/web-platform-tests/dom/ranges/Range-commonAncestorContainer.html&quot;: [
+        &quot;slow&quot;
+    ],
+    &quot;imported/w3c/web-platform-tests/dom/ranges/Range-compareBoundaryPoints.html&quot;: [
+        &quot;slow&quot;
+    ],
+    &quot;imported/w3c/web-platform-tests/dom/ranges/Range-comparePoint-2.html&quot;: [
+        &quot;slow&quot;
+    ],
+    &quot;imported/w3c/web-platform-tests/dom/ranges/Range-comparePoint.html&quot;: [
+        &quot;slow&quot;
+    ],
+    &quot;imported/w3c/web-platform-tests/dom/ranges/Range-deleteContents.html&quot;: [
+        &quot;slow&quot;
+    ],
+    &quot;imported/w3c/web-platform-tests/dom/ranges/Range-detach.html&quot;: [
+        &quot;slow&quot;
+    ],
+    &quot;imported/w3c/web-platform-tests/dom/ranges/Range-extractContents.html&quot;: [
+        &quot;slow&quot;
+    ],
+    &quot;imported/w3c/web-platform-tests/dom/ranges/Range-insertNode.html&quot;: [
+        &quot;slow&quot;
+    ],
+    &quot;imported/w3c/web-platform-tests/dom/ranges/Range-intersectsNode-binding.html&quot;: [
+        &quot;slow&quot;
+    ],
+    &quot;imported/w3c/web-platform-tests/dom/ranges/Range-intersectsNode.html&quot;: [
+        &quot;slow&quot;
+    ],
+    &quot;imported/w3c/web-platform-tests/dom/ranges/Range-isPointInRange.html&quot;: [
+        &quot;slow&quot;
+    ],
+    &quot;imported/w3c/web-platform-tests/dom/ranges/Range-mutations.html&quot;: [
+        &quot;slow&quot;
+    ],
+    &quot;imported/w3c/web-platform-tests/dom/ranges/Range-selectNode.html&quot;: [
+        &quot;slow&quot;
+    ],
+    &quot;imported/w3c/web-platform-tests/dom/ranges/Range-set.html&quot;: [
+        &quot;slow&quot;
+    ],
+    &quot;imported/w3c/web-platform-tests/dom/ranges/Range-surroundContents.html&quot;: [
+        &quot;slow&quot;
+    ],
+    &quot;imported/w3c/web-platform-tests/dom/traversal/NodeIterator-removal.html&quot;: [
+        &quot;slow&quot;
+    ],
+    &quot;imported/w3c/web-platform-tests/dom/traversal/NodeIterator.html&quot;: [
+        &quot;slow&quot;
+    ],
+    &quot;imported/w3c/web-platform-tests/dom/traversal/TreeWalker.html&quot;: [
+        &quot;slow&quot;
+    ],
+    &quot;imported/w3c/web-platform-tests/fetch/api/request/request-cache.html&quot;: [
+        &quot;slow&quot;
+    ],
+    &quot;imported/w3c/web-platform-tests/html/browsers/browsing-the-web/history-traversal/persisted-user-state-restoration/scroll-restoration-fragment-scrolling-cross-origin.html&quot;: [
+        &quot;slow&quot;
+    ],
+    &quot;imported/w3c/web-platform-tests/html/browsers/browsing-the-web/history-traversal/persisted-user-state-restoration/scroll-restoration-navigation-cross-origin.html&quot;: [
+        &quot;slow&quot;
+    ],
+    &quot;imported/w3c/web-platform-tests/html/browsers/browsing-the-web/scroll-to-fragid/007.html&quot;: [
+        &quot;slow&quot;
+    ],
+    &quot;imported/w3c/web-platform-tests/html/browsers/browsing-the-web/scroll-to-fragid/scroll-frag-percent-encoded.html&quot;: [
+        &quot;slow&quot;
+    ],
+    &quot;imported/w3c/web-platform-tests/html/browsers/browsing-the-web/scroll-to-fragid/scroll-to-anchor-name.html&quot;: [
+        &quot;slow&quot;
+    ],
+    &quot;imported/w3c/web-platform-tests/html/browsers/browsing-the-web/scroll-to-fragid/scroll-to-id-top.html&quot;: [
+        &quot;slow&quot;
+    ],
+    &quot;imported/w3c/web-platform-tests/html/browsers/browsing-the-web/scroll-to-fragid/scroll-to-top.html&quot;: [
+        &quot;slow&quot;
+    ],
+    &quot;imported/w3c/web-platform-tests/html/browsers/history/the-history-interface/007.html&quot;: [
+        &quot;slow&quot;
+    ],
+    &quot;imported/w3c/web-platform-tests/html/browsers/origin/cross-origin-objects/cross-origin-objects.sub.html&quot;: [
+        &quot;slow&quot;
+    ],
+    &quot;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&quot;: [
+        &quot;slow&quot;
+    ],
+    &quot;imported/w3c/web-platform-tests/html/dom/interfaces.html&quot;: [
+        &quot;slow&quot;
+    ],
+    &quot;imported/w3c/web-platform-tests/html/dom/reflection-embedded.html&quot;: [
+        &quot;slow&quot;
+    ],
+    &quot;imported/w3c/web-platform-tests/html/dom/reflection-forms.html&quot;: [
+        &quot;slow&quot;
+    ],
+    &quot;imported/w3c/web-platform-tests/html/dom/reflection-grouping.html&quot;: [
+        &quot;slow&quot;
+    ],
+    &quot;imported/w3c/web-platform-tests/html/dom/reflection-metadata.html&quot;: [
+        &quot;slow&quot;
+    ],
+    &quot;imported/w3c/web-platform-tests/html/dom/reflection-misc.html&quot;: [
+        &quot;slow&quot;
+    ],
+    &quot;imported/w3c/web-platform-tests/html/dom/reflection-obsolete.html&quot;: [
+        &quot;slow&quot;
+    ],
+    &quot;imported/w3c/web-platform-tests/html/dom/reflection-sections.html&quot;: [
+        &quot;slow&quot;
+    ],
+    &quot;imported/w3c/web-platform-tests/html/dom/reflection-tabular.html&quot;: [
+        &quot;slow&quot;
+    ],
+    &quot;imported/w3c/web-platform-tests/html/dom/reflection-text.html&quot;: [
+        &quot;slow&quot;
+    ],
+    &quot;imported/w3c/web-platform-tests/html/semantics/embedded-content/the-img-element/sizes/parse-a-sizes-attribute.html&quot;: [
+        &quot;slow&quot;
+    ],
+    &quot;imported/w3c/web-platform-tests/html/semantics/forms/textfieldselection/selection.html&quot;: [
+        &quot;slow&quot;
+    ]
+}
</ins></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (205475 => 205476)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog        2016-09-06 11:28:32 UTC (rev 205475)
+++ trunk/Tools/ChangeLog        2016-09-06 12:30:51 UTC (rev 205476)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2016-09-06  Youenn Fablet  &lt;youenn@apple.com&gt;
+
+        W3C test importer should be able to identify slow test
+        https://bugs.webkit.org/show_bug.cgi?id=161601
+
+        Reviewed by Darin Adler.
+
+        Test parser is now identifying slow tests based on &quot;meta element name=timeout content=long&quot; elements.
+        Test importer is updating test-options.json file according that information.
+
+        In case of clean import, the test-options.json is cleaned from 'slow' options for all W3C tests.
+
+        * Scripts/webkitpy/w3c/test_importer.py:
+        (TestImporter.__init__):
+        (TestImporter.find_importable_tests):
+        (TestImporter.import_tests):
+        (TestImporter.update_test_options):
+        (TestImporter):
+        (TestImporter.remove_slow_from_w3c_test_options):
+        * Scripts/webkitpy/w3c/test_parser.py:
+        (TestParser.analyze_test):
+        (TestParser.is_slow_test):
+        (TestParser.potential_ref_filename):
+
</ins><span class="cx"> 2016-09-06  Per Arne Vollan  &lt;pvollan@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         [Win] Crash logs have incorrect symbols.
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpyw3ctest_importerpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/w3c/test_importer.py (205475 => 205476)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -168,7 +168,8 @@
</span><span class="cx"> 
</span><span class="cx">         self.destination_directory = webkit_finder.path_from_webkit_base(&quot;LayoutTests&quot;, options.destination)
</span><span class="cx">         self.tests_w3c_relative_path = self.filesystem.join('imported', 'w3c')
</span><del>-        self.layout_tests_w3c_path = webkit_finder.path_from_webkit_base('LayoutTests', self.tests_w3c_relative_path)
</del><ins>+        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)
</ins><span class="cx">         self.tests_download_path = webkit_finder.path_from_webkit_base('WebKitBuild', 'w3c-tests')
</span><span class="cx"> 
</span><span class="cx">         self._test_downloader = None
</span><span class="lines">@@ -180,8 +181,15 @@
</span><span class="cx"> 
</span><span class="cx">         self._test_resource_files_json_path = self.filesystem.join(self.layout_tests_w3c_path, &quot;resources&quot;, &quot;resource-files.json&quot;)
</span><span class="cx">         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
</span><ins>+
+        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 = []
+
</ins><span class="cx">         if self.options.clean_destination_directory and self._test_resource_files:
</span><span class="cx">             self._test_resource_files[&quot;files&quot;] = []
</span><ins>+            if self._tests_options:
+                self.remove_slow_from_w3c_tests_options()
</ins><span class="cx"> 
</span><span class="cx">     def do_import(self):
</span><span class="cx">         if not self.source_directory:
</span><span class="lines">@@ -305,6 +313,9 @@
</span><span class="cx">                 elif self._is_in_resources_directory(fullpath):
</span><span class="cx">                     _log.warning('%s is a test located in a &quot;resources&quot; folder. This test will be skipped by WebKit test runners.', fullpath)
</span><span class="cx"> 
</span><ins>+                if 'slow' in test_info:
+                    self._slow_tests.append(fullpath)
+
</ins><span class="cx">                 if 'manualtest' in test_info.keys():
</span><span class="cx">                     continue
</span><span class="cx"> 
</span><span class="lines">@@ -480,6 +491,9 @@
</span><span class="cx">                 files.sort()
</span><span class="cx">                 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'))
</span><span class="cx"> 
</span><ins>+        if self._tests_options:
+            self.update_tests_options()
+
</ins><span class="cx">     def _already_identified_as_resource_file(self, path):
</span><span class="cx">         if path in self._test_resource_files[&quot;files&quot;]:
</span><span class="cx">             return True
</span><span class="lines">@@ -488,6 +502,32 @@
</span><span class="cx">     def _is_in_resources_directory(self, path):
</span><span class="cx">         return &quot;resources&quot; in path.split(self.filesystem.sep)
</span><span class="cx"> 
</span><ins>+    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)
+
</ins><span class="cx">     def remove_deleted_files(self, import_directory, new_file_list):
</span><span class="cx">         &quot;&quot;&quot; Reads an import log in |import_directory|, compares it to the |new_file_list|, and removes files not in the new list.&quot;&quot;&quot;
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpyw3ctest_parserpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/w3c/test_parser.py (205475 => 205476)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -125,6 +125,9 @@
</span><span class="cx">         elif self.options['all'] is True:
</span><span class="cx">             test_info = {'test': self.filename}
</span><span class="cx"> 
</span><ins>+        if test_info and self.is_slow_test():
+            test_info['slow'] = True
+
</ins><span class="cx">         return test_info
</span><span class="cx"> 
</span><span class="cx">     def reference_links_of_type(self, reftest_type):
</span><span class="lines">@@ -138,9 +141,12 @@
</span><span class="cx">         &quot;&quot;&quot;Returns whether the test is a manual test according WPT rules (i.e. file ends with -manual.htm path).&quot;&quot;&quot;
</span><span class="cx">         return self.filename.endswith('-manual.htm') or self.filename.endswith('-manual.html')
</span><span class="cx"> 
</span><ins>+    def is_slow_test(self):
+        return any([match.name == 'meta' and match['name'] == 'timeout' for match in self.test_doc.findAll(content='long')])
+
</ins><span class="cx">     def potential_ref_filename(self):
</span><span class="cx">         parts = self.filesystem.splitext(self.filename)
</span><del>-        return  parts[0] + '-ref' + parts[1]
</del><ins>+        return parts[0] + '-ref' + parts[1]
</ins><span class="cx"> 
</span><span class="cx">     def is_wpt_reftest(self):
</span><span class="cx">         &quot;&quot;&quot;Returns whether the test is a ref test according WPT rules (i.e. file has a -ref.html counterpart).&quot;&quot;&quot;
</span></span></pre>
</div>
</div>

</body>
</html>