Modified: trunk/Tools/ChangeLog (159496 => 159497)
--- trunk/Tools/ChangeLog 2013-11-19 12:38:36 UTC (rev 159496)
+++ trunk/Tools/ChangeLog 2013-11-19 13:05:32 UTC (rev 159497)
@@ -1,3 +1,12 @@
+2013-11-19 Ryosuke Niwa <[email protected]>
+
+ Another build fix. Allow ':' in subtest names.
+
+ * Scripts/webkitpy/performance_tests/perftest.py:
+ (PerfTest._lines_to_ignore_in_parser_result):
+ * Scripts/webkitpy/performance_tests/perftest_unittest.py:
+ (TestPerfTest.test_parse_output_with_subtests)
+
2013-11-19 Ryuan Choi <[email protected]>
[EFL] Use Config mode of find_package for EFL 1.8
Modified: trunk/Tools/Scripts/webkitpy/performance_tests/perftest.py (159496 => 159497)
--- trunk/Tools/Scripts/webkitpy/performance_tests/perftest.py 2013-11-19 12:38:36 UTC (rev 159496)
+++ trunk/Tools/Scripts/webkitpy/performance_tests/perftest.py 2013-11-19 13:05:32 UTC (rev 159497)
@@ -235,7 +235,7 @@
re.compile(r"CONSOLE MESSAGE: (line \d+: )?Not allowed to load local resource"),
# Dromaeo reports values for subtests. Ignore them for now.
# FIXME: Remove once subtests are supported
- re.compile(r'^[A-Za-z0-9\., =\-\*\(\)\[\]]+( -> )(\[?[0-9\., ]+\])( [a-z/]+)?$'),
+ re.compile(r'^[A-Za-z0-9\(\[][A-Za-z0-9\., =:\-\*\(\)\[\]]+( -> )(\[?[0-9\., ]+\])( [a-z/]+)?$'),
]
def _filter_output(self, output):
Modified: trunk/Tools/Scripts/webkitpy/performance_tests/perftest_unittest.py (159496 => 159497)
--- trunk/Tools/Scripts/webkitpy/performance_tests/perftest_unittest.py 2013-11-19 12:38:36 UTC (rev 159496)
+++ trunk/Tools/Scripts/webkitpy/performance_tests/perftest_unittest.py 2013-11-19 13:05:32 UTC (rev 159497)
@@ -161,6 +161,7 @@
Array Construction, [] -> [11, 12, 13, 14, 15]
Concat String -> [15163, 15304, 15386, 15608, 15622]
jQuery - addClass -> [2785, 2815, 2826, 2841, 2861]
+Dojo - div:only-child -> [7825, 7910, 7950, 7958, 7970]
:Time -> [1080, 1120, 1095, 1101, 1104] ms
""", image=None, image_hash=None, audio=None)
