| Index: tools/telemetry/telemetry/page/html_page_measurement_results.py
|
| diff --git a/tools/telemetry/telemetry/page/html_page_measurement_results.py b/tools/telemetry/telemetry/page/html_page_measurement_results.py
|
| index a0b8b552322d1d7e8862c7d33885b060fd5b87eb..286ac237d69389c4aa46e53241529e6f3b0e2c2f 100644
|
| --- a/tools/telemetry/telemetry/page/html_page_measurement_results.py
|
| +++ b/tools/telemetry/telemetry/page/html_page_measurement_results.py
|
| @@ -11,21 +11,21 @@ import re
|
| from telemetry.core import util
|
| from telemetry.page import buildbot_page_measurement_results
|
| from telemetry.page import cloud_storage
|
| +from telemetry.page import page_measurement_value
|
|
|
| util.AddDirToPythonPath(util.GetChromiumSrcDir(), 'build', 'util')
|
| import lastchange # pylint: disable=F0401
|
|
|
| -
|
| _TEMPLATE_HTML_PATH = os.path.join(
|
| util.GetTelemetryDir(), 'support', 'html_output', 'results-template.html')
|
| _PLUGINS = [('third_party', 'flot', 'jquery.flot.min.js'),
|
| + ('third_party', 'flot', 'jquery.flot.errorbars.min.js'),
|
| ('third_party', 'WebKit', 'PerformanceTests', 'resources',
|
| 'jquery.tablesorter.min.js'),
|
| ('third_party', 'WebKit', 'PerformanceTests', 'resources',
|
| 'statistics.js')]
|
| _UNIT_JSON = ('tools', 'perf', 'unit-info.json')
|
|
|
| -
|
| class HtmlPageMeasurementResults(
|
| buildbot_page_measurement_results.BuildbotPageMeasurementResults):
|
| def __init__(self, output_stream, test_name, reset_results, upload_results,
|
| @@ -86,9 +86,7 @@ class HtmlPageMeasurementResults(
|
| super(HtmlPageMeasurementResults, self)._PrintPerfResult(
|
| measurement, trace, values, units, result_type)
|
|
|
| - metric_name = measurement
|
| - if trace != measurement:
|
| - metric_name += '.' + trace
|
| + metric_name = page_measurement_value.MeasurementName(measurement, trace)
|
| self._result_json['tests'].setdefault(self._test_name, {})
|
| self._result_json['tests'][self._test_name].setdefault('metrics', {})
|
| self._result_json['tests'][self._test_name]['metrics'][metric_name] = {
|
| @@ -100,6 +98,16 @@ class HtmlPageMeasurementResults(
|
| def PrintSummary(self):
|
| super(HtmlPageMeasurementResults, self).PrintSummary()
|
|
|
| + for k in self._comparison_stats.keys():
|
| + self._result_json['tests'].setdefault(self._test_name, {})
|
| + self._result_json['tests'][self._test_name].setdefault('metrics', {})
|
| + self._result_json['tests'][self._test_name]['metrics'][k] = {
|
| + 'reference_statistic': self._comparison_stats[k]['reference'],
|
| + 'comparison_statistic': self._comparison_stats[k]['comparison'],
|
| + 'units' : 'fraction',
|
| + 'important' : False,
|
| + }
|
| +
|
| json_results = self._GetResultsJson()
|
| json_results.append(self._result_json)
|
| html = self._GetHtmlTemplate()
|
|
|