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 76d1d4536bb5271690d358c2659a68a05afb4f5c..973eebed20669c7c79d5d70e36599fe7a076d0f7 100644 |
--- a/build/android/pylib/remote/device/remote_device_gtest_run.py |
+++ b/build/android/pylib/remote/device/remote_device_gtest_run.py |
@@ -73,20 +73,15 @@ class RemoteDeviceGtestTestRun(remote_device_test_run.RemoteDeviceTestRun): |
def _ParseTestResults(self): |
logging.info('Parsing results from stdout.') |
results = base_test_result.TestRunResults() |
- if self._results['results']['exception']: |
+ 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) |
+ if self._env.only_output_failures: |
+ logging.info('See logcat for more results information.') |
+ if not self._results['results']['pass']: |
results.AddResult(base_test_result.BaseTestResult( |
- self._results['results']['exception'], |
+ 'Remote Service detected error.', |
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) |
- if self._env.only_output_failures: |
- logging.info('See logcat for more results information.') |
- if not self._results['results']['pass']: |
- results.AddResult(base_test_result.BaseTestResult( |
- 'Remote Service detected error.', |
- base_test_result.ResultType.FAIL)) |
- return results |
+ return results |