build/android/pylib/instrumentation/instrumentation_test_instance.py - Issue 1836883002: [Android] Switch instrumentation tests to platform mode. (RELAND)

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/pylib/instrumentation/instrumentation_test_instance.py

Issue 1836883002: [Android] Switch instrumentation tests to platform mode. (RELAND) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: update CommandLineInitUtilTest Created 4 years, 9 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

« no previous file with comments | « base/android/javatests/src/org/chromium/base/CommandLineInitUtilTest.java ('k') | build/android/pylib/local/device/local_device_instrumentation_test_run.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: build/android/pylib/instrumentation/instrumentation_test_instance.py

diff --git a/build/android/pylib/instrumentation/instrumentation_test_instance.py b/build/android/pylib/instrumentation/instrumentation_test_instance.py

index 613b778d1fab4acd5bf281ca67a2e7fa04b71c8f..62d64b140222b6bf2434f6997f7df96eeb558769 100644

--- a/build/android/pylib/instrumentation/instrumentation_test_instance.py

+++ b/build/android/pylib/instrumentation/instrumentation_test_instance.py

@@ -290,7 +290,11 @@ class InstrumentationTestInstance(test_instance.TestInstance):

def _initializeDataDependencyAttributes(self, args, isolate_delegate):

self._data_deps = []

if args.isolate_file_path:

- self._isolate_abs_path = os.path.abspath(args.isolate_file_path)

+ if os.path.isabs(args.isolate_file_path):

+ self._isolate_abs_path = args.isolate_file_path

+ else:

+ self._isolate_abs_path = os.path.join(

+ constants.DIR_SOURCE_ROOT, args.isolate_file_path)

self._isolate_delegate = isolate_delegate

self._isolated_abs_path = os.path.join(

constants.GetOutDirectory(), '%s.isolated' % self._test_package)

@@ -340,7 +344,7 @@ class InstrumentationTestInstance(test_instance.TestInstance):

})

def _initializeFlagAttributes(self, args):

- self._flags = ['--disable-fre', '--enable-test-intents']

+ self._flags = ['--enable-test-intents']

# TODO(jbudorick): Transition "--device-flags" to "--device-flags-file"

if hasattr(args, 'device_flags') and args.device_flags:

with open(args.device_flags) as device_flags_file: