Chromium Code Reviews| Index: build/android/pylib/local/device/local_device_perf_test_run.py |
| diff --git a/build/android/pylib/local/device/local_device_perf_test_run.py b/build/android/pylib/local/device/local_device_perf_test_run.py |
| index afbd4e9c4dbffe81b93ea5ad464d7bd0e348c7e4..e0fafac7efa8acf735e7aacf1b1458effef12de5 100644 |
| --- a/build/android/pylib/local/device/local_device_perf_test_run.py |
| +++ b/build/android/pylib/local/device/local_device_perf_test_run.py |
| @@ -425,7 +425,7 @@ class LocalDevicePerfTestRun(local_device_test_run.LocalDeviceTestRun): |
| # Affinitize the tests. |
| if self._test_instance.trace_output: |
| assert not trace_event.trace_is_enabled(), 'Tracing already running.' |
| - trace_event.trace_enable(self._test_instance.trace_output) |
| + trace_event.trace_enable(self._test_instance.trace_output + '.json') |
| self._SplitTestsByAffinity() |
| if not self._test_buckets and not self._no_device_tests: |
| raise local_device_test_run.NoTestsError() |
| @@ -466,6 +466,8 @@ class LocalDevicePerfTestRun(local_device_test_run.LocalDeviceTestRun): |
| if self._test_instance.trace_output: |
| assert trace_event.trace_is_enabled(), 'Tracing not running.' |
| trace_event.trace_disable() |
| + self._JsonToTrace(self._test_instance.trace_output + '.json', |
|
agrieve
2016/12/20 19:27:03
nit: shouldn't call static method via "self". Use
rnephew (Reviews Here)
2016/12/20 19:37:56
Done.
|
| + self._test_instance.trace_output) |
| return host_test_results + device_test_results |
| # override |