Title: [136134] trunk/Tools
Revision
136134
Author
[email protected]
Date
2012-11-29 08:50:45 -0800 (Thu, 29 Nov 2012)

Log Message

run-perf-tests --chromium-android fails due to Skia INFO logging
https://bugs.webkit.org/show_bug.cgi?id=103585

Reviewed by Adam Barth.

Ignore all INFO logging from Chromium code.
Also added some basic testing of the ignored-stderr lines code.

* Scripts/webkitpy/performance_tests/perftest.py:
(PerfTest):
* Scripts/webkitpy/performance_tests/perftest_unittest.py:
(MainTest.test_ignored_stderr_lines):

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (136133 => 136134)


--- trunk/Tools/ChangeLog	2012-11-29 15:48:33 UTC (rev 136133)
+++ trunk/Tools/ChangeLog	2012-11-29 16:50:45 UTC (rev 136134)
@@ -1,3 +1,18 @@
+2012-11-29  Eric Seidel  <[email protected]>
+
+        run-perf-tests --chromium-android fails due to Skia INFO logging
+        https://bugs.webkit.org/show_bug.cgi?id=103585
+
+        Reviewed by Adam Barth.
+
+        Ignore all INFO logging from Chromium code.
+        Also added some basic testing of the ignored-stderr lines code.
+
+        * Scripts/webkitpy/performance_tests/perftest.py:
+        (PerfTest):
+        * Scripts/webkitpy/performance_tests/perftest_unittest.py:
+        (MainTest.test_ignored_stderr_lines):
+
 2012-11-29  Sudarsana Nagineni  <[email protected]>
 
         [EFL][WK2] Add support for PlatformWebView::simulateMouseMove() in TestWebKitAPI

Modified: trunk/Tools/Scripts/webkitpy/performance_tests/perftest.py (136133 => 136134)


--- trunk/Tools/Scripts/webkitpy/performance_tests/perftest.py	2012-11-29 15:48:33 UTC (rev 136133)
+++ trunk/Tools/Scripts/webkitpy/performance_tests/perftest.py	2012-11-29 16:50:45 UTC (rev 136134)
@@ -103,7 +103,9 @@
 
     _lines_to_ignore_in_stderr = [
         re.compile(r'^Unknown option:'),
-        re.compile(r'^\[WARNING:proxy_service.cc')]
+        re.compile(r'^\[WARNING:proxy_service.cc'),
+        re.compile(r'^\[INFO:'),
+    ]
 
     def _should_ignore_line_in_stderr(self, line):
         return self._should_ignore_line(self._lines_to_ignore_in_stderr, line)

Modified: trunk/Tools/Scripts/webkitpy/performance_tests/perftest_unittest.py (136133 => 136134)


--- trunk/Tools/Scripts/webkitpy/performance_tests/perftest_unittest.py	2012-11-29 15:48:33 UTC (rev 136133)
+++ trunk/Tools/Scripts/webkitpy/performance_tests/perftest_unittest.py	2012-11-29 16:50:45 UTC (rev 136134)
@@ -99,7 +99,25 @@
         self.assertEqual(actual_stderr, '')
         self.assertEqual(actual_logs, 'some-unrecognizable-line\n')
 
+    def test_ignored_stderr_lines(self):
+        test = PerfTest(MockPort(), 'some-test', '/path/some-dir/some-test')
+        ignored_lines = [
+            "Unknown option: --foo-bar",
+            "[WARNING:proxy_service.cc] bad moon a-rising",
+            "[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/",
+        ]
+        for line in ignored_lines:
+            self.assertTrue(test._should_ignore_line_in_stderr(line))
 
+        non_ignored_lines = [
+            "Should not be ignored",
+            "[WARNING:chrome.cc] Something went wrong",
+            "[ERROR:main.cc] The sky has fallen",
+        ]
+        for line in non_ignored_lines:
+            self.assertFalse(test._should_ignore_line_in_stderr(line))
+
+
 class TestPageLoadingPerfTest(unittest.TestCase):
     class MockDriver(object):
         def __init__(self, values, test, measurements=None):
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to