Modified: trunk/Tools/ChangeLog (106061 => 106062)
--- trunk/Tools/ChangeLog 2012-01-27 00:31:29 UTC (rev 106061)
+++ trunk/Tools/ChangeLog 2012-01-27 00:37:27 UTC (rev 106062)
@@ -1,3 +1,20 @@
+2012-01-26 Ryosuke Niwa <rn...@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 <dpra...@chromium.org>
webkitpy: re-land cleanup of test scaffolding
Modified: trunk/Tools/Scripts/webkitpy/performance_tests/perftestsrunner.py (106061 => 106062)
--- trunk/Tools/Scripts/webkitpy/performance_tests/perftestsrunner.py 2012-01-27 00:31:29 UTC (rev 106061)
+++ trunk/Tools/Scripts/webkitpy/performance_tests/perftestsrunner.py 2012-01-27 00:37:27 UTC (rev 106062)
@@ -249,7 +249,7 @@
_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 @@
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
Modified: trunk/Tools/Scripts/webkitpy/performance_tests/perftestsrunner_unittest.py (106061 => 106062)
--- trunk/Tools/Scripts/webkitpy/performance_tests/perftestsrunner_unittest.py 2012-01-27 00:31:29 UTC (rev 106061)
+++ trunk/Tools/Scripts/webkitpy/performance_tests/perftestsrunner_unittest.py 2012-01-27 00:37:27 UTC (rev 106062)
@@ -189,7 +189,7 @@
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 @@
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"})
