<!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>[173557] 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/173557">173557</a></dd>
<dt>Author</dt> <dd>eric.carlson@apple.com</dd>
<dt>Date</dt> <dd>2014-09-12 06:06:13 -0700 (Fri, 12 Sep 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Strip extraneous AVFoundation and CoreMedia logging
https://bugs.webkit.org/show_bug.cgi?id=136747
Reviewed by Jer Noble.
* Scripts/webkitpy/layout_tests/controllers/single_test_runner.py:
(SingleTestRunner._run_compare_test): Allow the port to specify patterns to strip from stderr.
* Scripts/webkitpy/port/base.py:
(Port.stderr_patterns_to_strip): Base class, empty list
* Scripts/webkitpy/port/driver.py:
(DriverOutput.strip_stderror_patterns): Strip the specified patterns from stderr.
* Scripts/webkitpy/port/ios.py:
(IOSSimulatorPort.stderr_patterns_to_strip): iOS patterns - there are none.
* Scripts/webkitpy/port/mac.py:
(MacPort.stderr_patterns_to_strip): CoreMedia and AVFoundation logging we can ignore.</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="#trunkToolsScriptswebkitpyportiospy">trunk/Tools/Scripts/webkitpy/port/ios.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 (173556 => 173557)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-09-12 05:32:33 UTC (rev 173556)
+++ trunk/Tools/ChangeLog 2014-09-12 13:06:13 UTC (rev 173557)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2014-09-12 Eric Carlson <eric.carlson@apple.com>
+
+ Strip extraneous AVFoundation and CoreMedia logging
+ https://bugs.webkit.org/show_bug.cgi?id=136747
+
+ Reviewed by Jer Noble.
+
+ * Scripts/webkitpy/layout_tests/controllers/single_test_runner.py:
+ (SingleTestRunner._run_compare_test): Allow the port to specify patterns to strip from stderr.
+
+ * Scripts/webkitpy/port/base.py:
+ (Port.stderr_patterns_to_strip): Base class, empty list
+
+ * Scripts/webkitpy/port/driver.py:
+ (DriverOutput.strip_stderror_patterns): Strip the specified patterns from stderr.
+
+ * Scripts/webkitpy/port/ios.py:
+ (IOSSimulatorPort.stderr_patterns_to_strip): iOS patterns - there are none.
+
+ * Scripts/webkitpy/port/mac.py:
+ (MacPort.stderr_patterns_to_strip): CoreMedia and AVFoundation logging we can ignore.
+
+
</ins><span class="cx"> 2014-09-11 Michael Saboff <msaboff@apple.com>
</span><span class="cx">
</span><span class="cx"> lldb_webkit.py:btjs doesn't work with release builds
</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 (173556 => 173557)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/layout_tests/controllers/single_test_runner.py 2014-09-12 05:32:33 UTC (rev 173556)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/controllers/single_test_runner.py 2014-09-12 13:06:13 UTC (rev 173557)
</span><span class="lines">@@ -116,6 +116,8 @@
</span><span class="cx"> expected_driver_output.strip_patterns(patterns)
</span><span class="cx"> driver_output.strip_patterns(patterns)
</span><span class="cx">
</span><ins>+ driver_output.strip_stderror_patterns(self._port.stderr_patterns_to_strip())
+
</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 (173556 => 173557)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/port/base.py 2014-09-12 05:32:33 UTC (rev 173556)
+++ trunk/Tools/Scripts/webkitpy/port/base.py 2014-09-12 13:06:13 UTC (rev 173557)
</span><span class="lines">@@ -1399,6 +1399,9 @@
</span><span class="cx"> def logging_patterns_to_strip(self):
</span><span class="cx"> return []
</span><span class="cx">
</span><ins>+ def stderr_patterns_to_strip(self):
+ return []
+
</ins><span class="cx"> def test_expectations_file_position(self):
</span><span class="cx"> # By default baseline search path schema is i.e. port-wk2 -> wk2 -> port -> generic, so port expectations file is at second to last position.
</span><span class="cx"> return 1
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpyportdriverpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/port/driver.py (173556 => 173557)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/port/driver.py 2014-09-12 05:32:33 UTC (rev 173556)
+++ trunk/Tools/Scripts/webkitpy/port/driver.py 2014-09-12 13:06:13 UTC (rev 173557)
</span><span class="lines">@@ -107,6 +107,12 @@
</span><span class="cx"> for pattern in patterns:
</span><span class="cx"> self.text = re.sub(pattern[0], pattern[1], self.text)
</span><span class="cx">
</span><ins>+ def strip_stderror_patterns(self, patterns):
+ if not self.error:
+ return
+ for pattern in patterns:
+ self.error = re.sub(pattern[0], pattern[1], self.error)
+
</ins><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="trunkToolsScriptswebkitpyportiospy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/port/ios.py (173556 => 173557)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/port/ios.py 2014-09-12 05:32:33 UTC (rev 173556)
+++ trunk/Tools/Scripts/webkitpy/port/ios.py 2014-09-12 13:06:13 UTC (rev 173557)
</span><span class="lines">@@ -350,3 +350,6 @@
</span><span class="cx">
</span><span class="cx"> def logging_patterns_to_strip(self):
</span><span class="cx"> return []
</span><ins>+
+ def stderr_patterns_to_strip(self):
+ return []
</ins></span></pre></div>
<a id="trunkToolsScriptswebkitpyportmacpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/port/mac.py (173556 => 173557)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/port/mac.py 2014-09-12 05:32:33 UTC (rev 173556)
+++ trunk/Tools/Scripts/webkitpy/port/mac.py 2014-09-12 13:06:13 UTC (rev 173557)
</span><span class="lines">@@ -323,3 +323,14 @@
</span><span class="cx"> def logging_patterns_to_strip(self):
</span><span class="cx"> # FIXME: Remove this after <rdar://problem/15605007> is fixed
</span><span class="cx"> return [(re.compile('(AVF|GVA) info:.*\n'), '')]
</span><ins>+
+ def stderr_patterns_to_strip(self):
+ worthless_patterns = []
+ worthless_patterns.append((re.compile('.*(Fig|fig|itemasync|vt|mv_|PullParamSetSPS|ccrp_|client).* signalled err=.*\n'), ''))
+ worthless_patterns.append((re.compile('.*<<<< FigFilePlayer >>>>.*\n'), ''))
+ worthless_patterns.append((re.compile('.*<<<< FigFile >>>>.*\n'), ''))
+ worthless_patterns.append((re.compile('.*<<<< FAQ >>>>.*\n'), ''))
+ worthless_patterns.append((re.compile('.*<<<< MediaValidator >>>>.*\n'), ''))
+ worthless_patterns.append((re.compile('.*<<<< VMC >>>>.*\n'), ''))
+ worthless_patterns.append((re.compile('.*<<< FFR_Common >>>.*\n'), ''))
+ return worthless_patterns
</ins></span></pre>
</div>
</div>
</body>
</html>