Title: [159418] trunk/Tools
- Revision
- 159418
- Author
- [email protected]
- Date
- 2013-11-18 06:42:55 -0800 (Mon, 18 Nov 2013)
Log Message
Remove _lines_to_ignore_in_stderr, which was only used in Chromium port
https://bugs.webkit.org/show_bug.cgi?id=124499
Reviewed by Csaba Osztrogonác.
Removed the code. I didn't like this hack back when it was added, and I don't like it today.
* Scripts/webkitpy/performance_tests/perftest.py:
(PerfTest._should_ignore_line):
* Scripts/webkitpy/performance_tests/perftest_unittest.py:
(TestPerfTest): Removed the unit test.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (159417 => 159418)
--- trunk/Tools/ChangeLog 2013-11-18 12:23:29 UTC (rev 159417)
+++ trunk/Tools/ChangeLog 2013-11-18 14:42:55 UTC (rev 159418)
@@ -1,3 +1,17 @@
+2013-11-18 Ryosuke Niwa <[email protected]>
+
+ Remove _lines_to_ignore_in_stderr, which was only used in Chromium port
+ https://bugs.webkit.org/show_bug.cgi?id=124499
+
+ Reviewed by Csaba Osztrogonác.
+
+ Removed the code. I didn't like this hack back when it was added, and I don't like it today.
+
+ * Scripts/webkitpy/performance_tests/perftest.py:
+ (PerfTest._should_ignore_line):
+ * Scripts/webkitpy/performance_tests/perftest_unittest.py:
+ (TestPerfTest): Removed the unit test.
+
2013-11-17 Filip Pizlo <[email protected]>
Unreviewed, fix this script for older Rubies where Pathname doesn't coerce to String
Modified: trunk/Tools/Scripts/webkitpy/performance_tests/perftest.py (159417 => 159418)
--- trunk/Tools/Scripts/webkitpy/performance_tests/perftest.py 2013-11-18 12:23:29 UTC (rev 159417)
+++ trunk/Tools/Scripts/webkitpy/performance_tests/perftest.py 2013-11-18 14:42:55 UTC (rev 159418)
@@ -230,15 +230,6 @@
return True
return False
- _lines_to_ignore_in_stderr = [
- re.compile(r'^Unknown option:'),
- re.compile(r'^\[WARNING:proxy_service.cc'),
- re.compile(r'^\[INFO:'),
- # These stderr messages come from content_shell on chromium-linux.
- re.compile(r'INFO:SkFontHost_fontconfig.cpp'),
- re.compile(r'Running without the SUID sandbox'),
- ]
-
_lines_to_ignore_in_parser_result = [
re.compile(r'^Running \d+ times$'),
re.compile(r'^Ignoring warm-up '),
@@ -257,8 +248,6 @@
]
def _filter_output(self, output):
- if output.error:
- output.error = '\n'.join([line for line in re.split('\n', output.error) if not self._should_ignore_line(self._lines_to_ignore_in_stderr, line)])
if output.text:
output.text = '\n'.join([line for line in re.split('\n', output.text) if not self._should_ignore_line(self._lines_to_ignore_in_parser_result, line)])
Modified: trunk/Tools/Scripts/webkitpy/performance_tests/perftest_unittest.py (159417 => 159418)
--- trunk/Tools/Scripts/webkitpy/performance_tests/perftest_unittest.py 2013-11-18 12:23:29 UTC (rev 159417)
+++ trunk/Tools/Scripts/webkitpy/performance_tests/perftest_unittest.py 2013-11-18 14:42:55 UTC (rev 159418)
@@ -165,21 +165,6 @@
self._assert_results_are_correct(test, output)
self.assertEqual(test.description(), 'this is a test description.')
- def test_ignored_stderr_lines(self):
- test = PerfTest(MockPort(), 'some-test', '/path/some-dir/some-test')
- output_with_lines_to_ignore = DriverOutput('', image=None, image_hash=None, audio=None, error="""
-Unknown option: --foo-bar
-Should not be ignored
-[WARNING:proxy_service.cc] bad moon a-rising
-[WARNING:chrome.cc] Something went wrong
-[INFO:SkFontHost_android.cpp(1158)] Use Test Config File Main /data/local/tmp/drt/android_main_fonts.xml, Fallback /data/local/tmp/drt/android_fallback_fonts.xml, Font Dir /data/local/tmp/drt/fonts/
-[ERROR:main.cc] The sky has fallen""")
- test._filter_output(output_with_lines_to_ignore)
- self.assertEqual(output_with_lines_to_ignore.error,
- "Should not be ignored\n"
- "[WARNING:chrome.cc] Something went wrong\n"
- "[ERROR:main.cc] The sky has fallen")
-
def test_parse_output_with_subtests(self):
output = DriverOutput("""
Running 20 times
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
