Changeset 136134 in webkit

Timestamp:

Nov 29, 2012, 8:50:45 AM (14 years ago)

Author:

eric@webkit.org

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):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/performance_tests/perftest.py (modified) (1 diff)
• Scripts/webkitpy/performance_tests/perftest_unittest.py (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2012-11-29  Eric Seidel  <eric@webkit.org>
+
+        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  <sudarsana.nagineni@intel.com>
 

trunk/Tools/Scripts/webkitpy/performance_tests/perftest.py

@@ -104 +104 @@
     _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):

trunk/Tools/Scripts/webkitpy/performance_tests/perftest_unittest.py

@@ -100 +100 @@
         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):