Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(903)

Unified Diff: build/android/test_runner.py

Issue 689293002: Add option to push files to device using isolate for instrumentation tests. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed nits. Created 6 years, 1 month 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 d5c9b3597cebddbc87a4363b623f06f5c2006613..bce79d57cfc7c52d58aa864c1a02076940cbdd89 100755
--- a/build/android/test_runner.py
+++ b/build/android/test_runner.py
@@ -272,6 +272,11 @@ def AddInstrumentationTestOptions(option_parser):
option_parser.add_option('--device-flags', dest='device_flags', default='',
help='The relative filepath to a file containing '
'command-line flags to set on the device')
+ option_parser.add_option('--isolate_file_path',
+ '--isolate-file-path',
+ dest='isolate_file_path',
+ help='.isolate file path to override the default '
+ 'path')
def ProcessInstrumentationOptions(options, error_func):
@@ -334,7 +339,8 @@ def ProcessInstrumentationOptions(options, error_func):
options.test_apk_jar_path,
options.test_runner,
options.test_support_apk_path,
- options.device_flags
+ options.device_flags,
+ options.isolate_file_path
)
@@ -657,7 +663,8 @@ def _RunInstrumentationTests(options, error_func, devices):
exit_code = 0
if options.run_java_tests:
- runner_factory, tests = instrumentation_setup.Setup(instrumentation_options)
+ runner_factory, tests = instrumentation_setup.Setup(
+ instrumentation_options, devices)
test_results, exit_code = test_dispatcher.RunTests(
tests, runner_factory, devices, shard=True, test_timeout=None,

Powered by Google App Engine
This is Rietveld 408576698