Test Runner changes for Integration tests.
Test Runner changes to allow integration tests as well as the ability
to point the device's google_base_url (or any android shell flag) to
a specified value in stored in a .flags file.
BUG=None
Review URL: https://codereview.chromium.org/444243002
Cr-Commit-Position: refs/heads/master@{#288202}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@288202 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/build/android/test_runner.py b/build/android/test_runner.py
index 8aebb8b4b..8a4b9fa4 100755
--- a/build/android/test_runner.py
+++ b/build/android/test_runner.py
@@ -201,7 +201,7 @@
options.annotations = []
else:
options.annotations = ['Smoke', 'SmallTest', 'MediumTest', 'LargeTest',
- 'EnormousTest']
+ 'EnormousTest', 'IntegrationTest']
if options.exclude_annotation_str:
options.exclude_annotations = options.exclude_annotation_str.split(',')
@@ -237,6 +237,9 @@
option_parser.add_option('--coverage-dir',
help=('Directory in which to place all generated '
'EMMA coverage files.'))
+ 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')
def ProcessInstrumentationOptions(options, error_func):
@@ -299,7 +302,8 @@
options.test_apk_path,
options.test_apk_jar_path,
options.test_runner,
- options.test_support_apk_path
+ options.test_support_apk_path,
+ options.device_flags
)
@@ -597,6 +601,10 @@
if test_exit_code and exit_code != constants.ERROR_EXIT_CODE:
exit_code = test_exit_code
+ if options.device_flags:
+ options.device_flags = os.path.join(constants.DIR_SOURCE_ROOT,
+ options.device_flags)
+
report_results.LogFull(
results=results,
test_type='Instrumentation',
