<!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>[179610] trunk/Tools</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/179610">179610</a></dd>
<dt>Author</dt> <dd>rniwa@webkit.org</dd>
<dt>Date</dt> <dd>2015-02-04 10:07:06 -0800 (Wed, 04 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[webkitpy] Add platform specific Skipped file mechanism for performance tests
https://bugs.webkit.org/show_bug.cgi?id=141152
Reviewed by Csaba Osztrogonác.
Support a test-expectation-like syntax in performance tests' skipped files.
e.g. [Mac] Parsed/BadTest.html will skip Parsed/BadTest.html on Mac ports.
* Scripts/webkitpy/port/base.py:
(Port.skipped_perf_tests): Implemented the syntax support by a regular expression.
* Scripts/webkitpy/port/base_unittest.py:
(PortTest.test_skipped_perf_tests): Test the new syntax.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptswebkitpyportbasepy">trunk/Tools/Scripts/webkitpy/port/base.py</a></li>
<li><a href="#trunkToolsScriptswebkitpyportbase_unittestpy">trunk/Tools/Scripts/webkitpy/port/base_unittest.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (179609 => 179610)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-02-04 18:00:05 UTC (rev 179609)
+++ trunk/Tools/ChangeLog 2015-02-04 18:07:06 UTC (rev 179610)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2015-02-03 Ryosuke Niwa <rniwa@webkit.org>
+
+ [webkitpy] Add platform specific Skipped file mechanism for performance tests
+ https://bugs.webkit.org/show_bug.cgi?id=141152
+
+ Reviewed by Csaba Osztrogonác.
+
+ Support a test-expectation-like syntax in performance tests' skipped files.
+ e.g. [Mac] Parsed/BadTest.html will skip Parsed/BadTest.html on Mac ports.
+
+ * Scripts/webkitpy/port/base.py:
+ (Port.skipped_perf_tests): Implemented the syntax support by a regular expression.
+
+ * Scripts/webkitpy/port/base_unittest.py:
+ (PortTest.test_skipped_perf_tests): Test the new syntax.
+
</ins><span class="cx"> 2015-02-04 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><span class="cx"> When tests fail on leaks bot so much that there are no leaks detected, dashboard erroneously shows green
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpyportbasepy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/port/base.py (179609 => 179610)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/port/base.py 2015-02-04 18:00:05 UTC (rev 179609)
+++ trunk/Tools/Scripts/webkitpy/port/base.py 2015-02-04 18:07:06 UTC (rev 179610)
</span><span class="lines">@@ -699,8 +699,25 @@
</span><span class="cx">
</span><span class="cx"> @memoized
</span><span class="cx"> def skipped_perf_tests(self):
</span><del>- return self._expectations_from_skipped_files([self.perf_tests_dir()])
</del><ins>+ filename = self._filesystem.join(self.perf_tests_dir(), "Skipped")
+ if not self._filesystem.exists(filename):
+ _log.debug("Skipped does not exist: %s" % filename)
+ return []
</ins><span class="cx">
</span><ins>+ skipped_file_contents = self._filesystem.read_text_file(filename)
+ tests_to_skip = []
+ for line_number, line in enumerate(skipped_file_contents.split('\n')):
+ match = re.match(r'^\s*(\[(?P<platforms>[\w ]*?)\])?\s*(?P<test>[\w\-\/\.]+?)?\s*(?P<comment>\#.*)?$', line)
+ if not match:
+ _log.error("Syntax error at line %d in %s: %s" % (line_number + 1, filename, line))
+ else:
+ platform_names = filter(lambda token: token, match.group('platforms').lower().split(' ')) if match.group('platforms') else []
+ test_name = match.group('test')
+ if test_name and (not platform_names or self.port_name in platform_names or self._name in platform_names):
+ tests_to_skip.append(test_name)
+
+ return tests_to_skip
+
</ins><span class="cx"> def skips_perf_test(self, test_name):
</span><span class="cx"> for test_or_category in self.skipped_perf_tests():
</span><span class="cx"> if test_or_category == test_name:
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpyportbase_unittestpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/port/base_unittest.py (179609 => 179610)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/port/base_unittest.py 2015-02-04 18:00:05 UTC (rev 179609)
+++ trunk/Tools/Scripts/webkitpy/port/base_unittest.py 2015-02-04 18:07:06 UTC (rev 179610)
</span><span class="lines">@@ -147,8 +147,8 @@
</span><span class="cx"> add_text_file('inspector', 'test2.html')
</span><span class="cx"> add_text_file('inspector/resources', 'resource_file.html')
</span><span class="cx"> add_text_file('unsupported', 'unsupported_test2.html')
</span><del>- add_text_file('', 'Skipped', '\n'.join(['Layout', '', 'SunSpider', 'Supported/some-test.html']))
- self.assertEqual(port.skipped_perf_tests(), ['Layout', 'SunSpider', 'Supported/some-test.html'])
</del><ins>+ add_text_file('', 'Skipped', '\n'.join(['Layout', '', 'SunSpider', 'Supported/some-test.html', '[ExoticPort] UnskippedTest.html', '[baseport] SkippedTest.html']))
+ self.assertEqual(port.skipped_perf_tests(), ['Layout', 'SunSpider', 'Supported/some-test.html', 'SkippedTest.html'])
</ins><span class="cx">
</span><span class="cx"> def test_get_option__set(self):
</span><span class="cx"> options, args = optparse.OptionParser().parse_args([])
</span></span></pre>
</div>
</div>
</body>
</html>