[Android] Changes python_test_root to host-driven-root

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 196 matching lines @@
                            '--test-apk=ChromiumTestShellTest')
 
   AddJavaTestOptions(option_parser)
   AddCommonOptions(option_parser)
 
   option_parser.add_option('-j', '--java_only', action='store_true',
                            default=False, help='Run only the Java tests.')
   option_parser.add_option('-p', '--python_only', action='store_true',
                            default=False,
                            help='Run only the host-driven tests.')
-  option_parser.add_option('--python_test_root',
+  option_parser.add_option('--python_test_root', '--host-driven-root',
+                           dest='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.'))
 
@@ skipping 15 matching lines @@
   if options.java_only and options.python_only:
     error_func('Options java_only (-j) and python_only (-p) '
                'are mutually exclusive.')
   options.run_java_tests = True
   options.run_python_tests = True
   if options.java_only:
     options.run_python_tests = False
   elif options.python_only:
     options.run_java_tests = False
 
-  if not options.python_test_root:
+  if not options.host_driven_root:
     options.run_python_tests = False
 
   if not options.test_apk:
     error_func('--test-apk must be specified.')
 
   if os.path.exists(options.test_apk):
     # The APK is fully qualified, assume the JAR lives along side.
     options.test_apk_path = options.test_apk
     options.test_apk_jar_path = (os.path.splitext(options.test_apk_path)[0] +
                                  '.jar')
@@ skipping 211 matching lines @@
         options.test_device,
         shard=True,
         build_type=options.build_type,
         test_timeout=None,
         num_retries=options.num_retries)
 
     results.AddTestRunResults(test_results)
 
   if options.run_python_tests:
     runner_factory, tests = host_driven_setup.InstrumentationSetup(
-        options.python_test_root, options.official_build,
+        options.host_driven_root, options.official_build,
         instrumentation_options)
 
     if tests:
       test_results, test_exit_code = test_dispatcher.RunTests(
           tests, runner_factory, False,
           options.test_device,
           shard=True,
           build_type=options.build_type,
           test_timeout=None,
           num_retries=options.num_retries)
@@ skipping 189 matching lines @@
     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)
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))