Android Add _incremental targets for instrumentation tests

build/android/test_runner.py

 #!/usr/bin/env python
 #
 # Copyright 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Runs all types of tests from one unified interface."""
 
 import argparse
 import collections
@@ skipping 214 matching lines @@
   group.add_argument('--tool',
                      dest='tool',
                      help=('Run the test under a tool '
                            '(use --tool help to list them)'))
   group.add_argument('-d', '--device', dest='test_device',
                      help=('Target device for the test suite '
                            'to run on.'))
   group.add_argument('--blacklist-file', help='Device blacklist file.')
   group.add_argument('--enable-device-cache', action='store_true',
                      help='Cache device state to disk between runs')
-  group.add_argument('--incremental-install', action='store_true',
-                     help='Use an _incremental apk.')
   group.add_argument('--enable-concurrent-adb', action='store_true',
                      help='Run multiple adb commands at the same time, even '
                           'for the same device.')
   group.add_argument('--skip-clear-data', action='store_true',
                      help='Do not wipe app data between tests. Use this to '
                      'speed up local development and never on bots '
                      '(increases flakiness)')
 
 
 def AddGTestOptions(parser):
   """Adds gtest options to |parser|."""
 
   group = parser.add_argument_group('GTest Options')
   group.add_argument('-s', '--suite', dest='suite_name',
                      nargs='+', metavar='SUITE_NAME', required=True,
                      help='Executable name of the test suite to run.')
+  group.add_argument('--test-apk-install-script',

[jbudorick, 2016/02/09 20:08:27]

If these arguments are going to trigger incremental mode, they should have
incremental somewhere in the name.

Also, I'm going to try to figure out how to hide these in the help text at some
point, because I imagine it'll be nearly impossible for someone to use these
outside the scope of a generated script.

[agrieve, 2016/02/09 21:43:50]

Done.

+                     help='Path to install script for the test apk.')
   group.add_argument('--gtest_also_run_disabled_tests',
                      '--gtest-also-run-disabled-tests',
                      dest='run_disabled', action='store_true',
                      help='Also run disabled tests if applicable.')
   group.add_argument('-a', '--test-arguments', dest='test_arguments',
                      default='',
                      help='Additional arguments to pass to the test.')
   group.add_argument('-t', '--shard-timeout',
                      dest='shard_timeout', type=int, default=120,
                      help='Timeout to wait for each test '
@@ skipping 126 matching lines @@
   java_or_python_group.add_argument(
       '-p', '--python-only', action='store_false',
       dest='run_java_tests', default=True,
       help='Run only the host-driven tests.')
 
   group.add_argument('--host-driven-root',
                      help='Root of the host-driven tests.')
   group.add_argument('-w', '--wait_debugger', dest='wait_for_debugger',
                      action='store_true',
                      help='Wait for debugger.')
-  group.add_argument('--apk-under-test', dest='apk_under_test',
-                     help=('the name of the apk under test.'))
-  group.add_argument('--test-apk', dest='test_apk', required=True,
-                     help=('The name of the apk containing the tests '
-                           '(without the .apk extension; '
-                           'e.g. "ContentShellTest").'))
+  group.add_argument('--apk-under-test',
+                     help='Path or name of the apk under test.')
+  group.add_argument('--apk-under-test-install-script',
+                     help='Path to install script for the --apk-under-test.')
+  group.add_argument('--test-apk', required=True,
+                     help='Path or name of the apk containing the tests '
+                          '(name is without the .apk extension; '
+                          'e.g. "ContentShellTest").')
+  group.add_argument('--test-apk-install-script',
+                     help='Path to install script for the --test-apk.')
   group.add_argument('--additional-apk', action='append',
                      dest='additional_apks', default=[],
                      help='Additional apk that must be installed on '
                           'the device when the tests are run')
   group.add_argument('--coverage-dir',
                      help=('Directory in which to place all generated '
                            'EMMA coverage files.'))
   group.add_argument('--device-flags', dest='device_flags', default='',
                      help='The relative filepath to a file containing '
                           'command-line flags to set on the device')
@@ skipping 38 matching lines @@
 
   if os.path.exists(args.test_apk):
     args.test_apk_path = args.test_apk
     args.test_apk, _ = os.path.splitext(os.path.basename(args.test_apk))
   else:
     args.test_apk_path = os.path.join(
         constants.GetOutDirectory(),
         constants.SDK_BUILD_APKS_DIR,
         '%s.apk' % args.test_apk)
 
+  jar_basename = args.test_apk
+  if jar_basename.endswith('_incremental'):
+    jar_basename = jar_basename[:-12]
+
   args.test_apk_jar_path = os.path.join(
       constants.GetOutDirectory(),
       constants.SDK_BUILD_TEST_JAVALIB_DIR,
-      '%s.jar' % args.test_apk)
+      '%s.jar' % jar_basename)
   args.test_support_apk_path = '%sSupport%s' % (
       os.path.splitext(args.test_apk_path))
 
   args.test_runner = apk_helper.GetInstrumentationName(args.test_apk_path)
 
   # TODO(jbudorick): Get rid of InstrumentationOptions.
   return instrumentation_test_options.InstrumentationOptions(
       args.tool,
       args.annotations,
       args.exclude_annotations,
       args.test_filter,
       args.test_data,
       args.save_perf_json,
       args.screenshot_failures,
       args.wait_for_debugger,
       args.coverage_dir,
       args.test_apk,
       args.test_apk_path,
       args.test_apk_jar_path,
       args.test_runner,
       args.test_support_apk_path,
       args.device_flags,
       args.isolate_file_path,
       args.set_asserts,
       args.delete_stale_data,
       args.timeout_scale,
       args.apk_under_test,
       args.additional_apks,
       args.strict_mode,
-      args.skip_clear_data)
+      args.skip_clear_data,
+      args.test_apk_install_script,
+      args.apk_under_test_install_script)
 
 
 def AddUIAutomatorTestOptions(parser):
   """Adds UI Automator test options to |parser|."""
 
   group = parser.add_argument_group('UIAutomator Test Options')
   AddJavaTestOptions(group)
   group.add_argument(
       '--package', required=True, choices=constants.PACKAGE_INFO.keys(),
       metavar='PACKAGE', help='Package under test.')
@@ skipping 620 matching lines @@
     if e.is_infra_error:
       return constants.INFRA_EXIT_CODE
     return constants.ERROR_EXIT_CODE
   except: # pylint: disable=W0702
     logging.exception('Unrecognized error occurred.')
     return constants.ERROR_EXIT_CODE
 
 
 if __name__ == '__main__':
   sys.exit(main())