mojo/tools/apptest_runner.py - Issue 963713003: Support --origin in android_mojo_shell.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: mojo/tools/apptest_runner.py

Issue 963713003: Support --origin in android_mojo_shell. (Closed) Base URL: git@github.com:domokit/mojo.git@master

Patch Set: Move atexit.register(StopShell) to StartShell. Created 5 years, 10 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: mojo/tools/apptest_runner.py

diff --git a/mojo/tools/apptest_runner.py b/mojo/tools/apptest_runner.py

index f2b459b980476f71a9651fb52b9cc609b3614d20..11adf27209714b064e276b1ce2e78159c18e8b0f 100755

--- a/mojo/tools/apptest_runner.py

+++ b/mojo/tools/apptest_runner.py

@@ -43,9 +43,9 @@ def main():

apptest_list = execution_globals["tests"]

_logging.debug("Test list: %s" % apptest_list)

- android_origin_argument = None

+ extra_args = []

if config.target_os == Config.OS_ANDROID:

- android_origin_argument = android.PrepareShellRun(config)

+ extra_args.extend(android.PrepareShellRun(config))

gtest.set_color()

mojo_paths = Paths(config)

@@ -54,9 +54,7 @@ def main():

for apptest_dict in apptest_list:

apptest = apptest_dict["test"]

test_args = apptest_dict.get("test-args", [])

- shell_args = apptest_dict.get("shell-args", [])

- if android_origin_argument:

- shell_args.append(android_origin_argument)

+ shell_args = apptest_dict.get("shell-args", []) + extra_args

launched_services = apptest_dict.get("launched-services", [])

print "Running " + apptest + "...",

« no previous file with comments | « mojo/tools/android_mojo_shell.py ('k') | mojo/tools/mopy/android.py » ('j') | no next file with comments »