diff options
| author | msw <msw@chromium.org> | 2015-06-05 17:31:33 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-06-06 00:32:12 +0000 |
| commit | ecce673617583e7f020518791b97dca6eeccef9e (patch) | |
| tree | f1657e5500a423d0e8db9fb2402d7fde5e3df411 /mandoline/tools | |
| parent | 580afd414f1ba102a53eaa39bc670737efd4b3a6 (diff) | |
| download | chromium_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 'mandoline/tools')
| -rwxr-xr-x | mandoline/tools/android_run_mandoline.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/mandoline/tools/android_run_mandoline.py b/mandoline/tools/android_run_mandoline.py index d5540a4..71ac9ad3 100755 --- a/mandoline/tools/android_run_mandoline.py +++ b/mandoline/tools/android_run_mandoline.py @@ -9,7 +9,7 @@ import os import sys sys.path.insert(0, os.path.join(os.path.abspath(os.path.dirname(__file__)), - '../../mojo/tools')) + os.pardir, os.pardir, 'mojo', 'tools')) from mopy.android import AndroidShell from mopy.config import Config @@ -38,9 +38,7 @@ def main(): is_debug=runner_args.debug, apk_name="Mandoline.apk") shell = AndroidShell(config) - args.extend(shell.PrepareShellRun(None, runner_args.device, runner_args.gdb)) - - shell.CleanLogs() + shell.InitShell(None, runner_args.device) p = shell.ShowLogs() shell.StartShell(args, sys.stdout, p.terminate, runner_args.gdb) return 0 |