Make android's run_instrumentation_suite() use generated wrapper scripts

scripts/slave/recipe_modules/chromium_android/api.py

 # 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.
 
 import contextlib
 import datetime
 import json
 import os
 import re
 import urllib
@@ skipping 643 matching lines @@
           source=archive,
           bucket=upload_archives_to_bucket,
           dest=dest,
           link_name='output_dir.zip')
 
     if failures:
       raise self.m.step.StepFailure('sharded perf tests failed %s' % failures)
 
   def run_instrumentation_suite(self,
                                 name,
-                                test_apk,
+                                test_apk=None,
                                 apk_under_test=None,
                                 additional_apks=None,
                                 isolate_file_path=None,
                                 flakiness_dashboard=None,
                                 annotation=None, except_annotation=None,
                                 screenshot=False, verbose=False, tool=None,
-                                apk_package=None, host_driven_root=None,
-                                official_build=False, json_results_file=None,
+                                apk_package=None,
+                                host_driven_root=None,  # unused?
+                                official_build=False,
+                                json_results_file=None,
                                 timeout_scale=None, strict_mode=None,
                                 suffix=None, num_retries=None,
-                                device_flags=None, **kwargs):
+                                device_flags=None,
+                                wrapper_script_suite_name=None,
+                                **kwargs):
     if apk_under_test:
       # TODO(jbudorick): Remove this once the test runner handles installation
       # of the APK under test.
       self.adb_install_apk(apk_under_test)
 
     logcat_output_file = self.m.raw_io.output()
     args = [
-      '--test-apk', test_apk,
       '--blacklist-file', self.blacklist_file,
       '--logcat-output-file', logcat_output_file,
     ]
-    if apk_under_test:
-      args.extend(['--apk-under-test', apk_under_test])
-    for a in additional_apks or []:
-      args.extend(['--additional-apk', a])
-    if isolate_file_path:
-      args.extend(['--isolate-file-path', isolate_file_path])
     if tool:
       args.append('--tool=%s' % tool)
     if flakiness_dashboard:
       args.extend(['--flakiness-dashboard-server', flakiness_dashboard])
     if annotation:
       args.extend(['-A', annotation])
     if except_annotation:
       args.extend(['-E', except_annotation])
     if screenshot:
       args.append('--screenshot')
     if verbose:
       args.append('--verbose')
-    if self.m.chromium.c.BUILD_CONFIG == 'Release':
-      args.append('--release')
     if self.c.coverage or self.c.incremental_coverage:
       args.extend(['--coverage-dir', self.coverage_dir])
     if host_driven_root:
       args.extend(['--host-driven-root', host_driven_root])
-    if official_build:
-      args.extend(['--official-build'])
     if json_results_file:
       args.extend(['--json-results-file', json_results_file])
     if timeout_scale:
       args.extend(['--timeout-scale', timeout_scale])
     if strict_mode:
       args.extend(['--strict-mode', strict_mode])
     if num_retries is not None:
       args.extend(['--num-retries', str(num_retries)])
     if device_flags:
       args.extend(['--device-flags', device_flags])
 
+    if not wrapper_script_suite_name:
+      args.insert(0, 'instrumentation')
+      args.extend(['--test-apk', test_apk])
+      if apk_under_test:
+        args.extend(['--apk-under-test', apk_under_test])
+      for a in additional_apks or []:
+        args.extend(['--additional-apk', a])
+      if isolate_file_path:
+        args.extend(['--isolate-file-path', isolate_file_path])
+      if self.m.chromium.c.BUILD_CONFIG == 'Release':
+        args.append('--release')
+      if official_build:
+        args.extend(['--official-build'])
+
     step_result = self.test_runner(
         'Instrumentation test %s%s' % (annotation or name,
                                        ' (%s)' % suffix if suffix else ''),
-        args=['instrumentation'] + args,
+        args=args,
+        wrapper_script_suite_name=wrapper_script_suite_name,
         **kwargs)
     if step_result.raw_io.output:
       step_result.presentation.logs['logcat'] = (
           step_result.raw_io.output.splitlines())
     return step_result
 
   def launch_gce_instances(self, snapshot='clean-17-l-phone-image-no-popups',
                            count=6):
     args = [
         self.m.properties['slavename'],
@@ skipping 500 matching lines @@
         i.result.presentation.status = self.m.step.EXCEPTION
         raise i
       elif (f.result.retcode == EXIT_CODES['warning']):
         w = self.m.step.StepWarning(f.name or f.reason, result=f.result)
         w.result.presentation.status = self.m.step.WARNING
         raise w
       elif (f.result.retcode == EXIT_CODES['error']):
         f.result.presentation.status = self.m.step.FAILURE
       raise
 
-  def test_runner(self, step_name, args=None, **kwargs):
+  def test_runner(self, step_name, args=None, wrapper_script_suite_name=None, **kwargs):
     """Wrapper for the python testrunner script.
 
     Args:
       step_name: Name of the step.
       args: Testrunner arguments.
     """
     with self.handle_exit_codes():
-      return self.m.python(
-          step_name, self.c.test_runner, args, **kwargs)
+      script = self.c.test_runner
+      if wrapper_script_suite_name:
+        script = self.m.chromium.output_dir.join('bin', 'run_%s' %
+                                                 wrapper_script_suite_name)
+      return self.m.python(step_name, script, args, **kwargs)