Fix output not appearing in individual steps on android.
Previously we were returning after writing out the chartjson data before getting a chance to print out the output from the previous step.
BUG=
Review URL: https://codereview.chromium.org/822813002
Cr-Commit-Position: refs/heads/master@{#310317}
diff --git a/build/android/test_runner.py b/build/android/test_runner.py
index bda3405..cc00781 100755
--- a/build/android/test_runner.py
+++ b/build/android/test_runner.py
@@ -773,13 +773,10 @@
return perf_test_runner.OutputJsonList(
perf_options.steps, perf_options.output_json_list)
- if perf_options.output_chartjson_data:
- return perf_test_runner.OutputChartjson(
- perf_options.print_step, perf_options.output_chartjson_data)
-
# Just print the results from a single previously executed step.
if perf_options.print_step:
- return perf_test_runner.PrintTestOutput(perf_options.print_step)
+ return perf_test_runner.PrintTestOutput(
+ perf_options.print_step, perf_options.output_chartjson_data)
runner_factory, tests, devices = perf_setup.Setup(perf_options)
