run-perf-test should include relative file paths in test names
authorrniwa@webkit.org <rniwa@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 27 Jan 2012 00:37:27 +0000 (00:37 +0000)
committerrniwa@webkit.org <rniwa@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 27 Jan 2012 00:37:27 +0000 (00:37 +0000)
https://bugs.webkit.org/show_bug.cgi?id=77144

Reviewed by Adam Birth.

Include all directory names in the test name separated by "/".
e.g. Bindings/event-target-wrapper.html translates to Bindings/event-target-wrapper

* Scripts/webkitpy/performance_tests/perftestsrunner.py:
(PerfTestsRunner):
(PerfTestsRunner._process_parser_test_result):
* Scripts/webkitpy/performance_tests/perftestsrunner_unittest.py:
(test_run_test_set_with_json_output):
(test_run_test_set_with_json_source):

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

Tools/ChangeLog
Tools/Scripts/webkitpy/performance_tests/perftestsrunner.py
Tools/Scripts/webkitpy/performance_tests/perftestsrunner_unittest.py

index 848ae584b88bbc99672cbb87ea2a253b6127fbb4..971fefd930c3f59658d0388c8a93963d58c393be 100644 (file)
@@ -1,3 +1,20 @@
+2012-01-26  Ryosuke Niwa  <rniwa@webkit.org>
+
+        run-perf-test should include relative file paths in test names
+        https://bugs.webkit.org/show_bug.cgi?id=77144
+
+        Reviewed by Adam Birth.
+
+        Include all directory names in the test name separated by "/".
+        e.g. Bindings/event-target-wrapper.html translates to Bindings/event-target-wrapper
+
+        * Scripts/webkitpy/performance_tests/perftestsrunner.py:
+        (PerfTestsRunner):
+        (PerfTestsRunner._process_parser_test_result):
+        * Scripts/webkitpy/performance_tests/perftestsrunner_unittest.py:
+        (test_run_test_set_with_json_output):
+        (test_run_test_set_with_json_source):
+
 2012-01-26  Dirk Pranke  <dpranke@chromium.org>
 
         webkitpy: re-land cleanup of test scaffolding
index cddb17dd9d94790fd07a2e9a9a9bf9745fc2d561..eb94550a64b3bd8bb3a9e3ed3e41f89123113159 100644 (file)
@@ -249,7 +249,7 @@ class PerfTestsRunner(object):
     _lines_to_ignore_in_parser_result = [
         re.compile(r'^Running \d+ times$'),
         re.compile(r'^Ignoring warm-up '),
-        re.compile(r'^\d+$'),
+        re.compile(r'^\d+(.\d+)?$'),
     ]
 
     def _should_ignore_line_in_parser_test_result(self, line):
@@ -281,7 +281,7 @@ class PerfTestsRunner(object):
 
         if test_failed or set(keys) != set(results.keys()):
             return True
-        self._results[test_name] = results
+        self._results[filesystem.join(category, test_name).replace('\\', '/')] = results
         self._buildbot_output.write('RESULT %s: %s= %s ms\n' % (category, test_name, results['avg']))
         self._buildbot_output.write(', '.join(['%s= %s ms' % (key, results[key]) for key in keys[1:]]) + '\n')
         return False
index cfdaf7bc0bd9f7d006b1b9a546c35ceb3b4c576d..50b419ea6d06d0de9fd6851a63f08ec804452a3e 100755 (executable)
@@ -189,7 +189,7 @@ max 1120
 
         self.assertEqual(json.loads(runner._host.filesystem.files['/mock-checkout/output.json']), {
             "timestamp": 123456789, "results":
-            {"event-target-wrapper": {"max": 1510, "avg": 1489.05, "median": 1487, "min": 1471, "stdev": 14.46},
+            {"Bindings/event-target-wrapper": {"max": 1510, "avg": 1489.05, "median": 1487, "min": 1471, "stdev": 14.46},
             "group_name:test_name": 42},
             "revision": 1234})
 
@@ -209,7 +209,7 @@ max 1120
 
         self.assertEqual(json.loads(runner._host.filesystem.files['/mock-checkout/output.json']), {
             "timestamp": 123456789, "results":
-            {"event-target-wrapper": {"max": 1510, "avg": 1489.05, "median": 1487, "min": 1471, "stdev": 14.46},
+            {"Bindings/event-target-wrapper": {"max": 1510, "avg": 1489.05, "median": 1487, "min": 1471, "stdev": 14.46},
             "group_name:test_name": 42},
             "revision": 1234,
             "key": "value"})