Title: [173557] trunk/Tools
- Revision
- 173557
- Author
- [email protected]
- Date
- 2014-09-12 06:06:13 -0700 (Fri, 12 Sep 2014)
Log Message
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.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (173556 => 173557)
--- trunk/Tools/ChangeLog 2014-09-12 05:32:33 UTC (rev 173556)
+++ trunk/Tools/ChangeLog 2014-09-12 13:06:13 UTC (rev 173557)
@@ -1,3 +1,26 @@
+2014-09-12 Eric Carlson <[email protected]>
+
+ 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.
+
+
2014-09-11 Michael Saboff <[email protected]>
lldb_webkit.py:btjs doesn't work with release builds
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/controllers/single_test_runner.py (173556 => 173557)
--- 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)
@@ -116,6 +116,8 @@
expected_driver_output.strip_patterns(patterns)
driver_output.strip_patterns(patterns)
+ driver_output.strip_stderror_patterns(self._port.stderr_patterns_to_strip())
+
test_result = self._compare_output(expected_driver_output, driver_output)
if self._options.new_test_results:
self._add_missing_baselines(test_result, driver_output)
Modified: trunk/Tools/Scripts/webkitpy/port/base.py (173556 => 173557)
--- 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)
@@ -1399,6 +1399,9 @@
def logging_patterns_to_strip(self):
return []
+ def stderr_patterns_to_strip(self):
+ return []
+
def test_expectations_file_position(self):
# By default baseline search path schema is i.e. port-wk2 -> wk2 -> port -> generic, so port expectations file is at second to last position.
return 1
Modified: trunk/Tools/Scripts/webkitpy/port/driver.py (173556 => 173557)
--- 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)
@@ -107,6 +107,12 @@
for pattern in patterns:
self.text = re.sub(pattern[0], pattern[1], self.text)
+ 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)
+
class Driver(object):
"""object for running test(s) using DumpRenderTree/WebKitTestRunner."""
Modified: trunk/Tools/Scripts/webkitpy/port/ios.py (173556 => 173557)
--- 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)
@@ -350,3 +350,6 @@
def logging_patterns_to_strip(self):
return []
+
+ def stderr_patterns_to_strip(self):
+ return []
Modified: trunk/Tools/Scripts/webkitpy/port/mac.py (173556 => 173557)
--- 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)
@@ -323,3 +323,14 @@
def logging_patterns_to_strip(self):
# FIXME: Remove this after <rdar://problem/15605007> is fixed
return [(re.compile('(AVF|GVA) info:.*\n'), '')]
+
+ 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
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
