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 49ddc9100023a1153f9c81a9f780ac1963b15ede..3a6c4475101b7cdd51ab8c44a2d6caee087eb286 100644 |
--- a/build/android/pylib/remote/device/remote_device_gtest_run.py |
+++ b/build/android/pylib/remote/device/remote_device_gtest_run.py |
@@ -19,7 +19,7 @@ class RemoteDeviceGtestRun(remote_device_test_run.RemoteDeviceTestRun): |
"""Run gtests and uirobot tests on a remote device.""" |
DEFAULT_RUNNER_PACKAGE = ( |
- 'org.chromium.native_test.ChromiumNativeTestInstrumentationTestRunner') |
+ 'org.chromium.native_test.ChromeNativeTestInstrumentationTestRunner') |
#override |
def TestPackage(self): |
@@ -62,4 +62,8 @@ class RemoteDeviceGtestRun(remote_device_test_run.RemoteDeviceTestRun): |
if l.startswith(self._INSTRUMENTATION_STREAM_LEADER)) |
results_list = self._test_instance.ParseGTestOutput(output) |
results.AddResults(results_list) |
+ if not self._results['results']['pass']: |
+ results.AddResult(base_test_result.BaseTestResult( |
+ 'Remote Service detected error.', |
+ base_test_result.ResultType.FAIL)) |
return results |