Index: tools/telemetry/telemetry/results/results_options.py |
diff --git a/tools/telemetry/telemetry/results/results_options.py b/tools/telemetry/telemetry/results/results_options.py |
index 42b3ac2ee9deaf8d5a9655ca07a227c84b9838dd..f7501d282bc8585d6f2c339a18e387537ff27f79 100644 |
--- a/tools/telemetry/telemetry/results/results_options.py |
+++ b/tools/telemetry/telemetry/results/results_options.py |
@@ -8,6 +8,7 @@ import sys |
from telemetry.core import util |
from telemetry.results import buildbot_output_formatter |
+from telemetry.results import chart_json_output_formatter |
from telemetry.results import csv_output_formatter |
from telemetry.results import gtest_progress_reporter |
from telemetry.results import html_output_formatter |
@@ -17,7 +18,7 @@ from telemetry.results import progress_reporter |
# Allowed output formats. The default is the first item in the list. |
_OUTPUT_FORMAT_CHOICES = ('html', 'buildbot', 'block', 'csv', 'gtest', 'json', |
- 'none') |
+ 'chartjson', 'none') |
def AddResultsOptions(parser): |
@@ -104,6 +105,11 @@ def CreateResults(benchmark_metadata, options): |
output_formatters.append( |
json_output_formatter.JsonOutputFormatter(output_stream, |
benchmark_metadata)) |
+ elif options.output_format == 'chartjson': |
+ output_formatters.append( |
+ chart_json_output_formatter.ChartJsonOutputFormatter( |
+ output_stream, |
+ benchmark_metadata)) |
else: |
# Should never be reached. The parser enforces the choices. |
raise Exception('Invalid --output-format "%s". Valid choices are: %s' |