| OLD | NEW |
| 1 # Copyright 2014 The Chromium Authors. All rights reserved. | 1 # Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 import optparse | 5 import optparse |
| 6 import os | 6 import os |
| 7 import sys | 7 import sys |
| 8 | 8 |
| 9 from telemetry.core import util | 9 from telemetry.core import util |
| 10 from telemetry.page import page_measurement | 10 from telemetry.page import page_measurement |
| (...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 61 if not hasattr(options, 'output_format'): | 61 if not hasattr(options, 'output_format'): |
| 62 options.output_format = _OUTPUT_FORMAT_CHOICES[0] | 62 options.output_format = _OUTPUT_FORMAT_CHOICES[0] |
| 63 if not hasattr(options, 'output_trace_tag'): | 63 if not hasattr(options, 'output_trace_tag'): |
| 64 options.output_trace_tag = '' | 64 options.output_trace_tag = '' |
| 65 | 65 |
| 66 if options.output_format == 'none': | 66 if options.output_format == 'none': |
| 67 return page_measurement_results.PageMeasurementResults( | 67 return page_measurement_results.PageMeasurementResults( |
| 68 output_stream, trace_tag=options.output_trace_tag) | 68 output_stream, trace_tag=options.output_trace_tag) |
| 69 elif options.output_format == 'csv': | 69 elif options.output_format == 'csv': |
| 70 return csv_page_measurement_results.CsvPageMeasurementResults( | 70 return csv_page_measurement_results.CsvPageMeasurementResults( |
| 71 output_stream, test.results_are_the_same_on_every_page) | 71 output_stream) |
| 72 elif options.output_format == 'block': | 72 elif options.output_format == 'block': |
| 73 return block_page_measurement_results.BlockPageMeasurementResults( | 73 return block_page_measurement_results.BlockPageMeasurementResults( |
| 74 output_stream) | 74 output_stream) |
| 75 elif options.output_format == 'buildbot': | 75 elif options.output_format == 'buildbot': |
| 76 return buildbot_page_measurement_results.BuildbotPageMeasurementResults( | 76 return buildbot_page_measurement_results.BuildbotPageMeasurementResults( |
| 77 output_stream, trace_tag=options.output_trace_tag) | 77 output_stream, trace_tag=options.output_trace_tag) |
| 78 elif options.output_format == 'gtest': | 78 elif options.output_format == 'gtest': |
| 79 return gtest_test_results.GTestTestResults(output_stream) | 79 return gtest_test_results.GTestTestResults(output_stream) |
| 80 elif options.output_format == 'html': | 80 elif options.output_format == 'html': |
| 81 return html_page_measurement_results.HtmlPageMeasurementResults( | 81 return html_page_measurement_results.HtmlPageMeasurementResults( |
| 82 output_stream, test.__class__.__name__, options.reset_results, | 82 output_stream, test.__class__.__name__, options.reset_results, |
| 83 options.upload_results, options.browser_type, | 83 options.upload_results, options.browser_type, |
| 84 options.results_label, trace_tag=options.output_trace_tag) | 84 options.results_label, trace_tag=options.output_trace_tag) |
| 85 else: | 85 else: |
| 86 # Should never be reached. The parser enforces the choices. | 86 # Should never be reached. The parser enforces the choices. |
| 87 raise Exception('Invalid --output-format "%s". Valid choices are: %s' | 87 raise Exception('Invalid --output-format "%s". Valid choices are: %s' |
| 88 % (options.output_format, | 88 % (options.output_format, |
| 89 ', '.join(_OUTPUT_FORMAT_CHOICES))) | 89 ', '.join(_OUTPUT_FORMAT_CHOICES))) |
| OLD | NEW |