build/android/test_runner.py - Issue 1208483004: Make instrumentation test dependency on a support APK explicit

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: build/android/test_runner.py

Issue 1208483004: Make instrumentation test dependency on a support APK explicit (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase Created 5 years, 5 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:

View side-by-side diff with in-line comments

Download patch

Index: build/android/test_runner.py

diff --git a/build/android/test_runner.py b/build/android/test_runner.py

index d508ef8d7c446aee8950c41c7f5b0fab20ebe393..77872508ca9485b42979f32686abbd3fbda50293 100755

--- a/build/android/test_runner.py

+++ b/build/android/test_runner.py

@@ -332,6 +332,11 @@ def AddInstrumentationTestOptions(parser):

help=('The name of the apk containing the tests '

'(without the .apk extension; '

'e.g. "ContentShellTest").'))

+ group.add_argument('--support-apk', dest='test_support_apk_path',

+ help=('The path to an optional support apk to be '

+ 'installed alongside the test apk. The '

+ 'path should be relative to the output '

+ 'directory (--output-directory).'))

group.add_argument('--coverage-dir',

help=('Directory in which to place all generated '

'EMMA coverage files.'))

@@ -379,8 +384,6 @@ def ProcessInstrumentationOptions(args):

constants.GetOutDirectory(),

constants.SDK_BUILD_TEST_JAVALIB_DIR,

'%s.jar' % args.test_apk)

- args.test_support_apk_path = '%sSupport%s' % (

- os.path.splitext(args.test_apk_path))

args.test_runner = apk_helper.GetInstrumentationName(args.test_apk_path)

« no previous file with comments | « build/android/test_runner.gypi ('k') | build/config/android/internal_rules.gni » ('j') | no next file with comments »