<!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>[160247] 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/160247">160247</a></dd>
<dt>Author</dt> <dd>jer.noble@apple.com</dd>
<dt>Date</dt> <dd>2013-12-06 14:22:13 -0800 (Fri, 06 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Strip out extraneous logging from AppleGVA in media tests.
https://bugs.webkit.org/show_bug.cgi?id=125357
Reviewed by Simon Fraser.
Add a mechanism for stripping out abritrary regular expressions from test input and output.
* Scripts/webkitpy/layout_tests/controllers/single_test_runner.py:
(SingleTestRunner._run_compare_test): Strip out logging
* Scripts/webkitpy/port/base.py:
(Port.logging_patterns_to_strip): Return an empty list by default.
* Scripts/webkitpy/port/driver.py:
(DriverOutput.strip_patterns): Apply the port specific patterns to the text.
* Scripts/webkitpy/port/mac.py:
(MacPort.logging_patterns_to_strip): Return a complete list.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptswebkitpylayout_testscontrollerssingle_test_runnerpy">trunk/Tools/Scripts/webkitpy/layout_tests/controllers/single_test_runner.py</a></li>
<li><a href="#trunkToolsScriptswebkitpyportbasepy">trunk/Tools/Scripts/webkitpy/port/base.py</a></li>
<li><a href="#trunkToolsScriptswebkitpyportdriverpy">trunk/Tools/Scripts/webkitpy/port/driver.py</a></li>
<li><a href="#trunkToolsScriptswebkitpyportmacpy">trunk/Tools/Scripts/webkitpy/port/mac.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (160246 => 160247)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2013-12-06 22:05:10 UTC (rev 160246)
+++ trunk/Tools/ChangeLog 2013-12-06 22:22:13 UTC (rev 160247)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2013-12-06 Jer Noble <jer.noble@apple.com>
+
+ Strip out extraneous logging from AppleGVA in media tests.
+ https://bugs.webkit.org/show_bug.cgi?id=125357
+
+ Reviewed by Simon Fraser.
+
+ Add a mechanism for stripping out abritrary regular expressions from test input and output.
+
+ * Scripts/webkitpy/layout_tests/controllers/single_test_runner.py:
+ (SingleTestRunner._run_compare_test): Strip out logging
+ * Scripts/webkitpy/port/base.py:
+ (Port.logging_patterns_to_strip): Return an empty list by default.
+ * Scripts/webkitpy/port/driver.py:
+ (DriverOutput.strip_patterns): Apply the port specific patterns to the text.
+ * Scripts/webkitpy/port/mac.py:
+ (MacPort.logging_patterns_to_strip): Return a complete list.
+
</ins><span class="cx"> 2013-12-06 Dean Jackson <dino@apple.com>
</span><span class="cx">
</span><span class="cx"> Updating ANGLE should point to instructions
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpylayout_testscontrollerssingle_test_runnerpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/layout_tests/controllers/single_test_runner.py (160246 => 160247)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/layout_tests/controllers/single_test_runner.py 2013-12-06 22:05:10 UTC (rev 160246)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/controllers/single_test_runner.py 2013-12-06 22:22:13 UTC (rev 160247)
</span><span class="lines">@@ -112,6 +112,10 @@
</span><span class="cx"> expected_driver_output.strip_metrics()
</span><span class="cx"> driver_output.strip_metrics()
</span><span class="cx">
</span><ins>+ patterns = self._port.logging_patterns_to_strip()
+ expected_driver_output.strip_patterns(patterns)
+ driver_output.strip_patterns(patterns)
+
</ins><span class="cx"> test_result = self._compare_output(expected_driver_output, driver_output)
</span><span class="cx"> if self._options.new_test_results:
</span><span class="cx"> self._add_missing_baselines(test_result, driver_output)
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpyportbasepy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/port/base.py (160246 => 160247)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/port/base.py 2013-12-06 22:05:10 UTC (rev 160246)
+++ trunk/Tools/Scripts/webkitpy/port/base.py 2013-12-06 22:22:13 UTC (rev 160247)
</span><span class="lines">@@ -1541,6 +1541,8 @@
</span><span class="cx"> # By current convention, the WebKit2 name is always mac-wk2, win-wk2, not mac-leopard-wk2, etc,
</span><span class="cx"> return "%s-wk2" % self.port_name
</span><span class="cx">
</span><ins>+ def logging_patterns_to_strip(self):
+ return []
</ins><span class="cx">
</span><span class="cx"> class VirtualTestSuite(object):
</span><span class="cx"> def __init__(self, name, base, args, tests=None):
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpyportdriverpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/port/driver.py (160246 => 160247)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/port/driver.py 2013-12-06 22:05:10 UTC (rev 160246)
+++ trunk/Tools/Scripts/webkitpy/port/driver.py 2013-12-06 22:22:13 UTC (rev 160247)
</span><span class="lines">@@ -55,26 +55,26 @@
</span><span class="cx"> """Groups information about a output from driver for easy passing
</span><span class="cx"> and post-processing of data."""
</span><span class="cx">
</span><del>- strip_patterns = []
- strip_patterns.append((re.compile('at \(-?[0-9]+,-?[0-9]+\) *'), ''))
- strip_patterns.append((re.compile('size -?[0-9]+x-?[0-9]+ *'), ''))
- strip_patterns.append((re.compile('text run width -?[0-9]+: '), ''))
- strip_patterns.append((re.compile('text run width -?[0-9]+ [a-zA-Z ]+: '), ''))
- strip_patterns.append((re.compile('RenderButton {BUTTON} .*'), 'RenderButton {BUTTON}'))
- strip_patterns.append((re.compile('RenderImage {INPUT} .*'), 'RenderImage {INPUT}'))
- strip_patterns.append((re.compile('RenderBlock {INPUT} .*'), 'RenderBlock {INPUT}'))
- strip_patterns.append((re.compile('RenderTextControl {INPUT} .*'), 'RenderTextControl {INPUT}'))
- strip_patterns.append((re.compile('\([0-9]+px'), 'px'))
- strip_patterns.append((re.compile(' *" *\n +" *'), ' '))
- strip_patterns.append((re.compile('" +$'), '"'))
- strip_patterns.append((re.compile('- '), '-'))
- strip_patterns.append((re.compile('\n( *)"\s+'), '\n\g<1>"'))
- strip_patterns.append((re.compile('\s+"\n'), '"\n'))
- strip_patterns.append((re.compile('scrollWidth [0-9]+'), 'scrollWidth'))
- strip_patterns.append((re.compile('scrollHeight [0-9]+'), 'scrollHeight'))
- strip_patterns.append((re.compile('scrollX [0-9]+'), 'scrollX'))
- strip_patterns.append((re.compile('scrollY [0-9]+'), 'scrollY'))
- strip_patterns.append((re.compile('scrolled to [0-9]+,[0-9]+'), 'scrolled'))
</del><ins>+ metrics_patterns = []
+ metrics_patterns.append((re.compile('at \(-?[0-9]+,-?[0-9]+\) *'), ''))
+ metrics_patterns.append((re.compile('size -?[0-9]+x-?[0-9]+ *'), ''))
+ metrics_patterns.append((re.compile('text run width -?[0-9]+: '), ''))
+ metrics_patterns.append((re.compile('text run width -?[0-9]+ [a-zA-Z ]+: '), ''))
+ metrics_patterns.append((re.compile('RenderButton {BUTTON} .*'), 'RenderButton {BUTTON}'))
+ metrics_patterns.append((re.compile('RenderImage {INPUT} .*'), 'RenderImage {INPUT}'))
+ metrics_patterns.append((re.compile('RenderBlock {INPUT} .*'), 'RenderBlock {INPUT}'))
+ metrics_patterns.append((re.compile('RenderTextControl {INPUT} .*'), 'RenderTextControl {INPUT}'))
+ metrics_patterns.append((re.compile('\([0-9]+px'), 'px'))
+ metrics_patterns.append((re.compile(' *" *\n +" *'), ' '))
+ metrics_patterns.append((re.compile('" +$'), '"'))
+ metrics_patterns.append((re.compile('- '), '-'))
+ metrics_patterns.append((re.compile('\n( *)"\s+'), '\n\g<1>"'))
+ metrics_patterns.append((re.compile('\s+"\n'), '"\n'))
+ metrics_patterns.append((re.compile('scrollWidth [0-9]+'), 'scrollWidth'))
+ metrics_patterns.append((re.compile('scrollHeight [0-9]+'), 'scrollHeight'))
+ metrics_patterns.append((re.compile('scrollX [0-9]+'), 'scrollX'))
+ metrics_patterns.append((re.compile('scrollY [0-9]+'), 'scrollY'))
+ metrics_patterns.append((re.compile('scrolled to [0-9]+,[0-9]+'), 'scrolled'))
</ins><span class="cx">
</span><span class="cx"> def __init__(self, text, image, image_hash, audio, crash=False,
</span><span class="cx"> test_time=0, measurements=None, timeout=False, error='', crashed_process_name='??',
</span><span class="lines">@@ -99,12 +99,14 @@
</span><span class="cx"> return bool(self.error)
</span><span class="cx">
</span><span class="cx"> def strip_metrics(self):
</span><ins>+ self.strip_patterns(self.metrics_patterns)
+
+ def strip_patterns(self, patterns):
</ins><span class="cx"> if not self.text:
</span><span class="cx"> return
</span><del>- for pattern in self.strip_patterns:
</del><ins>+ for pattern in patterns:
</ins><span class="cx"> self.text = re.sub(pattern[0], pattern[1], self.text)
</span><span class="cx">
</span><del>-
</del><span class="cx"> class Driver(object):
</span><span class="cx"> """object for running test(s) using DumpRenderTree/WebKitTestRunner."""
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpyportmacpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/port/mac.py (160246 => 160247)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/port/mac.py 2013-12-06 22:05:10 UTC (rev 160246)
+++ trunk/Tools/Scripts/webkitpy/port/mac.py 2013-12-06 22:22:13 UTC (rev 160247)
</span><span class="lines">@@ -30,6 +30,7 @@
</span><span class="cx"> import logging
</span><span class="cx"> import os
</span><span class="cx"> import time
</span><ins>+import re
</ins><span class="cx">
</span><span class="cx"> from webkitpy.common.system.crashlogs import CrashLogs
</span><span class="cx"> from webkitpy.common.system.executive import ScriptError
</span><span class="lines">@@ -318,3 +319,7 @@
</span><span class="cx"> except ScriptError:
</span><span class="cx"> _log.warn("xcrun failed; falling back to '%s'." % fallback)
</span><span class="cx"> return fallback
</span><ins>+
+ def logging_patterns_to_strip(self):
+ # FIXME: Remove this after <rdar://problem/15605007> is fixed
+ return [(re.compile('(AVF|GVA) info:.*\n'), '')]
</ins></span></pre>
</div>
</div>
</body>
</html>