summaryrefslogtreecommitdiffstats
path: root/build/android
diff options
context:
space:
mode:
authormsw <msw@chromium.org>2015-06-05 17:31:33 -0700
committerCommit bot <commit-bot@chromium.org>2015-06-06 00:32:12 +0000
commitecce673617583e7f020518791b97dca6eeccef9e (patch)
treef1657e5500a423d0e8db9fb2402d7fde5e3df411 /build/android
parent580afd414f1ba102a53eaa39bc670737efd4b3a6 (diff)
downloadchromium_src-ecce673617583e7f020518791b97dca6eeccef9e.zip
chromium_src-ecce673617583e7f020518791b97dca6eeccef9e.tar.gz
chromium_src-ecce673617583e7f020518791b97dca6eeccef9e.tar.bz2
Report apptest_runner device not found infra failures.
Make AndroidShell.InitShell return an exit code. (infra exit code for infra errors and 'device not found') Inline CleanShell in InitShell; store --origin internally. Move gdb port forwarding to StartShell; minor refactoring. BUG=493900 TEST=Mojo/Mandoline python scripts work as expected. Bots yield purple builds on "device not found" errors. R=sky@chromium.org Review URL: https://codereview.chromium.org/1143223005 Cr-Commit-Position: refs/heads/master@{#333186}
Diffstat (limited to 'build/android')
-rwxr-xr-xbuild/android/test_runner.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/build/android/test_runner.py b/build/android/test_runner.py
index b71f805..52de8fd 100755
--- a/build/android/test_runner.py
+++ b/build/android/test_runner.py
@@ -1026,8 +1026,7 @@ def main():
logging.exception('Error occurred.')
if e.is_infra_error:
return constants.INFRA_EXIT_CODE
- else:
- return constants.ERROR_EXIT_CODE
+ return constants.ERROR_EXIT_CODE
except: # pylint: disable=W0702
logging.exception('Unrecognized error occurred.')
return constants.ERROR_EXIT_CODE