| Index: build/android/test_runner.py
|
| diff --git a/build/android/test_runner.py b/build/android/test_runner.py
|
| index 9632ed713872c99f737d08fb51d5f692079314aa..4113158fd38235779b852788867da6071b183cc3 100755
|
| --- a/build/android/test_runner.py
|
| +++ b/build/android/test_runner.py
|
| @@ -436,19 +436,20 @@ def _RunInstrumentationTests(options, error_func):
|
| options.python_test_root, options.official_build,
|
| instrumentation_options)
|
|
|
| - test_results, test_exit_code = test_dispatcher.RunTests(
|
| - tests, runner_factory, False,
|
| - options.test_device,
|
| - shard=True,
|
| - build_type=options.build_type,
|
| - test_timeout=None,
|
| - num_retries=options.num_retries)
|
| -
|
| - results.AddTestRunResults(test_results)
|
| -
|
| - # Only allow exit code escalation
|
| - if test_exit_code and exit_code != constants.ERROR_EXIT_CODE:
|
| - exit_code = test_exit_code
|
| + if tests:
|
| + test_results, test_exit_code = test_dispatcher.RunTests(
|
| + tests, runner_factory, False,
|
| + options.test_device,
|
| + shard=True,
|
| + build_type=options.build_type,
|
| + test_timeout=None,
|
| + num_retries=options.num_retries)
|
| +
|
| + results.AddTestRunResults(test_results)
|
| +
|
| + # Only allow exit code escalation
|
| + if test_exit_code and exit_code != constants.ERROR_EXIT_CODE:
|
| + exit_code = test_exit_code
|
|
|
| report_results.LogFull(
|
| results=results,
|
|
|