| Index: build/android/pylib/remote/device/remote_device_gtest_run.py
|
| diff --git a/build/android/pylib/remote/device/remote_device_gtest_run.py b/build/android/pylib/remote/device/remote_device_gtest_run.py
|
| index ca233f1023a8cbbb0ecdcb08cfded1898b51d5c4..d40263db151d1be9ab96a0a7f8d15a1943d1cb21 100644
|
| --- a/build/android/pylib/remote/device/remote_device_gtest_run.py
|
| +++ b/build/android/pylib/remote/device/remote_device_gtest_run.py
|
| @@ -54,10 +54,15 @@ class RemoteDeviceGtestRun(remote_device_test_run.RemoteDeviceTestRun):
|
| #override
|
| def _ParseTestResults(self):
|
| logging.info('Parsing results from stdout.')
|
| - output = self._results['results']['output'].splitlines()
|
| - output = (l[len(self._INSTRUMENTATION_STREAM_LEADER):] for l in output
|
| - if l.startswith(self._INSTRUMENTATION_STREAM_LEADER))
|
| - results_list = self._test_instance.ParseGTestOutput(output)
|
| results = base_test_result.TestRunResults()
|
| - results.AddResults(results_list)
|
| + if self._results['results']['exception']:
|
| + results.AddResult(base_test_result.BaseTestResult(
|
| + self._results['results']['exception'],
|
| + base_test_result.ResultType.FAIL))
|
| + else:
|
| + output = self._results['results']['output'].splitlines()
|
| + output = (l[len(self._INSTRUMENTATION_STREAM_LEADER):] for l in output
|
| + if l.startswith(self._INSTRUMENTATION_STREAM_LEADER))
|
| + results_list = self._test_instance.ParseGTestOutput(output)
|
| + results.AddResults(results_list)
|
| return results
|
|
|