Yet another build fix. Just allow any character.

There are just too many special characters to be listed here.

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

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@159498 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 3d913b0da3969c3cc2238f0edcd0e4cd0b8a4621..c2dfbf2fb9eb9c96a63caf151d3d23f9accf6549 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,13 @@
+2013-11-19  Ryosuke Niwa  <rniwa@webkit.org>
+
+        Yet another build fix. Just allow any character.
+        There are just too many special characters to be listed here.
+
+        * 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  Ryosuke Niwa  <rniwa@webkit.org>
 
         Another build fix. Allow ':' in subtest names.

diff --git a/Tools/Scripts/webkitpy/performance_tests/perftest.py b/Tools/Scripts/webkitpy/performance_tests/perftest.py
index 6a6650e75ed105b55a1a74b7c8c1a19e28464ae6..a95970c9ea3dfea27c47ccca86ffe7ade4c98f29 100644 (file)
--- a/Tools/Scripts/webkitpy/performance_tests/perftest.py
+++ b/Tools/Scripts/webkitpy/performance_tests/perftest.py
@@ -235,7 +235,7 @@ class PerfTest(object):
         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\(\[][A-Za-z0-9\., =:\-\*\(\)\[\]]+( -> )(\[?[0-9\., ]+\])( [a-z/]+)?$'),
+        re.compile(r'^[A-Za-z0-9\(\[].+( -> )(\[?[0-9\., ]+\])( [a-z/]+)?$'),
     ]
 
     def _filter_output(self, output):

diff --git a/Tools/Scripts/webkitpy/performance_tests/perftest_unittest.py b/Tools/Scripts/webkitpy/performance_tests/perftest_unittest.py
index 848ea5ffabe6314a042157f02cc0527d8269dd61..89449369f7764286cc5c5df8963cfcb9a2e8e352 100644 (file)
--- a/Tools/Scripts/webkitpy/performance_tests/perftest_unittest.py
+++ b/Tools/Scripts/webkitpy/performance_tests/perftest_unittest.py
@@ -162,6 +162,9 @@ 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]
+Dojo - div:nth-child(2n+1) -> [3620, 3623, 3633, 3641, 3658]
+Dojo - div > div -> [10158, 10172, 10180, 10183, 10231]
+Dojo - div ~ div -> [6673, 6675, 6714, 6848, 6902]
 
 :Time -> [1080, 1120, 1095, 1101, 1104] ms
 """, image=None, image_hash=None, audio=None)