[Android] Adds python option for EMMA coverage

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.
 
 TODO(gkanwar):
 * Add options to run Monkey tests.
@@ skipping 15 matching lines @@
 from pylib.host_driven import setup as host_driven_setup
 from pylib.instrumentation import setup as instrumentation_setup
 from pylib.instrumentation import test_options as instrumentation_test_options
 from pylib.monkey import setup as monkey_setup
 from pylib.monkey import test_options as monkey_test_options
 from pylib.perf import setup as perf_setup
 from pylib.perf import test_options as perf_test_options
 from pylib.perf import test_runner as perf_test_runner
 from pylib.uiautomator import setup as uiautomator_setup
 from pylib.uiautomator import test_options as uiautomator_test_options
+from pylib.utils import command_option_parser
 from pylib.utils import report_results
 from pylib.utils import run_tests_helper
 
 
 _SDK_OUT_DIR = os.path.join(constants.DIR_SOURCE_ROOT, 'out')
 
 
 def AddBuildTypeOption(option_parser):
   """Adds the build type option to |option_parser|."""
   default_build_type = 'Debug'
@@ skipping 175 matching lines @@
   option_parser.add_option('--host-driven-root',
                            help='Root of the host-driven tests.')
   option_parser.add_option('-w', '--wait_debugger', dest='wait_for_debugger',
                            action='store_true',
                            help='Wait for debugger.')
   option_parser.add_option(
       '--test-apk', dest='test_apk',
       help=('The name of the apk containing the tests '
             '(without the .apk extension; e.g. "ContentShellTest"). '
             'Alternatively, this can be a full path to the apk.'))
+  option_parser.add_option('--coverage-dir',
+                           help=('Directory in which to place all generated '
+                                 'EMMA coverage files.'))
 
 
 def ProcessInstrumentationOptions(options, error_func):
   """Processes options/arguments and populate |options| with defaults.
 
   Args:
     options: optparse.Options object.
     error_func: Function to call with the error message in case of an error.
 
   Returns:
@@ skipping 37 matching lines @@
       options.tool,
       options.cleanup_test_files,
       options.push_deps,
       options.annotations,
       options.exclude_annotations,
       options.test_filter,
       options.test_data,
       options.save_perf_json,
       options.screenshot_failures,
       options.wait_for_debugger,
+      options.coverage_dir,
       options.test_apk,
       options.test_apk_path,
       options.test_apk_jar_path)
 
 
 def AddUIAutomatorTestOptions(option_parser):
   """Adds UI Automator test options to |option_parser|."""
 
   option_parser.usage = '%prog uiautomator [options]'
   option_parser.command_list = []
@@ skipping 396 matching lines @@
     'uiautomator': CommandFunctionTuple(
         AddUIAutomatorTestOptions, RunTestsCommand),
     'monkey': CommandFunctionTuple(
         AddMonkeyTestOptions, RunTestsCommand),
     'perf': CommandFunctionTuple(
         AddPerfTestOptions, RunTestsCommand),
     'help': CommandFunctionTuple(lambda option_parser: None, HelpCommand)
     }
 
 
-class CommandOptionParser(optparse.OptionParser):
-  """Wrapper class for OptionParser to help with listing commands."""
-
-  def __init__(self, *args, **kwargs):
-    self.command_list = kwargs.pop('command_list', [])
-    self.example = kwargs.pop('example', '')
-    optparse.OptionParser.__init__(self, *args, **kwargs)
-
-  #override
-  def get_usage(self):
-    normal_usage = optparse.OptionParser.get_usage(self)
-    command_list = self.get_command_list()
-    example = self.get_example()
-    return self.expand_prog_name(normal_usage + example + command_list)
-
-  #override
-  def get_command_list(self):
-    if self.command_list:
-      return '\nCommands:\n  %s\n' % '\n  '.join(sorted(self.command_list))
-    return ''
-
-  def get_example(self):
-    if self.example:
-      return '\nExample:\n  %s\n' % self.example
-    return ''
-
-
 def main(argv):
-  option_parser = CommandOptionParser(
-      usage='Usage: %prog <command> [options]',
-      command_list=VALID_COMMANDS.keys())
-
-  if len(argv) < 2 or argv[1] not in VALID_COMMANDS:
-    # Parse args first, if this is '--help', optparse will display help and exit
-    option_parser.parse_args(argv)
-    option_parser.error('Invalid command.')
-  command = argv[1]
-  VALID_COMMANDS[command].add_options_func(option_parser)
-  options, args = option_parser.parse_args(argv)
-  return VALID_COMMANDS[command].run_command_func(
-      command, options, args, option_parser)
+  option_parser = command_option_parser.CommandOptionParser(
+      commands_dict=VALID_COMMANDS)
+  return command_option_parser.ParseAndExecute(option_parser)
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))