Modified: trunk/Tools/ChangeLog (159494 => 159495)
--- trunk/Tools/ChangeLog 2013-11-19 12:14:24 UTC (rev 159494)
+++ trunk/Tools/ChangeLog 2013-11-19 12:22:24 UTC (rev 159495)
@@ -1,3 +1,12 @@
+2013-11-19 Ryosuke Niwa <[email protected]>
+
+ Build fix. Subtest names need to be more permissive.
+
+ * 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-18 Mark Rowe <[email protected]>
Use hw.activecpu for determining how many processes to spawn.
Modified: trunk/Tools/Scripts/webkitpy/performance_tests/perftest.py (159494 => 159495)
--- trunk/Tools/Scripts/webkitpy/performance_tests/perftest.py 2013-11-19 12:14:24 UTC (rev 159494)
+++ trunk/Tools/Scripts/webkitpy/performance_tests/perftest.py 2013-11-19 12:22:24 UTC (rev 159495)
@@ -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\., =\-\*\(\)\[\]]+( -> )(\[?[0-9\., ]+\])( [a-z/]+)?$'),
]
def _filter_output(self, output):
Modified: trunk/Tools/Scripts/webkitpy/performance_tests/perftest_unittest.py (159494 => 159495)
--- trunk/Tools/Scripts/webkitpy/performance_tests/perftest_unittest.py 2013-11-19 12:14:24 UTC (rev 159494)
+++ trunk/Tools/Scripts/webkitpy/performance_tests/perftest_unittest.py 2013-11-19 12:22:24 UTC (rev 159495)
@@ -158,6 +158,9 @@
Description: this is a test description.
some test -> [1, 2, 3, 4, 5]
some other test = else -> [6, 7, 8, 9, 10]
+Array Construction, [] -> [11, 12, 13, 14, 15]
+Concat String -> [15163, 15304, 15386, 15608, 15622]
+jQuery - addClass -> [2785, 2815, 2826, 2841, 2861]
:Time -> [1080, 1120, 1095, 1101, 1104] ms
""", image=None, image_hash=None, audio=None)
