Modified: trunk/Tools/ChangeLog (117421 => 117422)
--- trunk/Tools/ChangeLog 2012-05-17 09:55:59 UTC (rev 117421)
+++ trunk/Tools/ChangeLog 2012-05-17 10:09:59 UTC (rev 117422)
@@ -1,5 +1,24 @@
2012-05-17 Kentaro Hara <hara...@chromium.org>
+ [Performance test] In perftest.py, do not include 'description' in 'results'
+ https://bugs.webkit.org/show_bug.cgi?id=86696
+
+ Reviewed by Csaba Osztrogoná.
+
+ 'results' in perftest.py should not include any data that is not expected
+ by the perf bot server. We do not need to send 'description' to the perf bot
+ server since 'description' is always the same.
+
+ Thus this patch just removes 'description' from 'results'.
+
+ * Scripts/webkitpy/performance_tests/perftest.py:
+ (PerfTest.parse_output):
+ (PerfTest.output_statistics):
+ (ChromiumStylePerfTest.parse_output):
+ (PageLoadingPerfTest.run):
+
+2012-05-17 Kentaro Hara <hara...@chromium.org>
+
[Performance test] Always fill results['description'] in perftest.py
https://bugs.webkit.org/show_bug.cgi?id=86696
Modified: trunk/Tools/Scripts/webkitpy/performance_tests/perftest.py (117421 => 117422)
--- trunk/Tools/Scripts/webkitpy/performance_tests/perftest.py 2012-05-17 09:55:59 UTC (rev 117421)
+++ trunk/Tools/Scripts/webkitpy/performance_tests/perftest.py 2012-05-17 10:09:59 UTC (rev 117422)
@@ -119,18 +119,17 @@
if test_failed or set(self._statistics_keys) != set(results.keys()):
return None
- results['description'] = description_string
results['unit'] = unit
test_name = re.sub(r'\.\w+$', '', self._test_name)
- self.output_statistics(test_name, results)
+ self.output_statistics(test_name, results, description_string)
return {test_name: results}
- def output_statistics(self, test_name, results):
+ def output_statistics(self, test_name, results, description_string):
unit = results['unit']
- if results['description']:
- _log.info('DESCRIPTION: %s' % results['description'])
+ if description_string:
+ _log.info('DESCRIPTION: %s' % description_string)
_log.info('RESULT %s= %s %s' % (test_name.replace('/', ': '), results['avg'], unit))
_log.info(', '.join(['%s= %s %s' % (key, results[key], unit) for key in self._statistics_keys[1:]]))
@@ -154,7 +153,6 @@
elif not len(line) == 0:
test_failed = True
_log.error(line)
- results['description'] = ''
return results if results and not test_failed else None
@@ -191,9 +189,8 @@
'max': max(test_times),
'median': test_times[middle] if len(test_times) % 2 else (test_times[middle - 1] + test_times[middle]) / 2,
'stdev': math.sqrt(squareSum),
- 'description': '',
'unit': 'ms'}
- self.output_statistics(self.test_name(), results)
+ self.output_statistics(self.test_name(), results, '')
return {self.test_name(): results}
