Add option to specify ADB binary in test runner.

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 collections
 import logging
@@ skipping 68 matching lines @@
                    help=('Address of the server that is hosting the '
                          'Chrome for Android flakiness dashboard.'))
   group.add_option('--enable-platform-mode', action='store_true',
                    help=('Run the test scripts in platform mode, which '
                          'conceptually separates the test runner from the '
                          '"device" (local or remote, real or emulated) on '
                          'which the tests are running. [experimental]'))
   group.add_option('-e', '--environment', default='local',
                    help=('Test environment to run in. Must be one of: %s' %
                          ', '.join(constants.VALID_ENVIRONMENTS)))
+  group.add_option('--adb-path',
+                   help=('Specify the absolute path of the adb binary that '
+                         'should be used.'))
   option_parser.add_option_group(group)
 
 
 def ProcessCommonOptions(options, error_func):
   """Processes and handles all common options."""
   run_tests_helper.SetLogLevel(options.verbose_count)
   constants.SetBuildType(options.build_type)
   if options.build_directory:
     constants.SetBuildDirectory(options.build_directory)
+  if options.adb_path:
+    constants.SetAdbPath(options.adb_path)
+  # Some things such as Forwarder require ADB to be in the environment path.

[jbudorick, 2014/11/11 15:27:23]

Where is this?

[mikecase (-- gone --), 2014/11/11 17:56:41]

Forwarder is used inside of base_test_runner.py (calls Forwarder.Map() for
example) and maybe some other places. I debated where to add adb to the path,
but if I do it inside test_runner.py its just done once, at the beginning of the
test run, and next to where the adb path is set which I like.

Previously, adb was added to the path inside androidcommands.py for
thirdparty/android_testrunner stuff (adding adb to the path here also happened
to make the Forwarder happy). Now thirdparty/android_testrunner doesnt need adb
in the path.

[jbudorick, 2014/11/11 18:04:03]

I suppose I should have been specific. Where does forwarder require adb to be in
the path?

[mikecase (-- gone --), 2014/11/11 19:36:01]

Inside pylib/forwarder.py, inside Map() function, it calls...

(exit_code, output) = cmd_helper.GetCmdStatusAndOutput(
              [instance._host_forwarder_path] + redirection_command)

...which calls the host_forwarder exec. This executable needs adb to be in the
path. You can check out like...

src/tools/android/forwarder2/host_forwarder_main.cc

For example...

    const std::string command = base::StringPrintf(
        "adb %s forward --remove tcp:%d",
        serial_part.c_str(),
        port);
    const int ret = system(command.c_str());

...seems to just do a system call to adb.

Anyway, here is the trybot error I got when I was not adding adb to the path
here.
http://build.chromium.org/p/tryserver.chromium.linux/builders/android_dbg_tes...

+  adb_dir = os.path.dirname(constants.GetAdbPath())
+  if adb_dir and adb_dir not in os.environ['PATH'].split(os.pathsep):

[jbudorick, 2014/11/11 15:27:23]

Also, what's up with this...?

[mikecase (-- gone --), 2014/11/11 17:56:41]

Not sure what you mean. Most of this is logic copied from where adb was
previously added to the path inside androidcommands.py.

I'll walk you through though.
1. constants.GetAdbPath() is either 'adb' or some full path to an adb binary (it
had always worked like this) so adb_dir=dirname(constants.GetAdbPath()) is
either '' or the directory adb is in. 
2. If adb_dir is a directory and not '', we check if its in os.environ['PATH']
already
3. If its not in the PATH, we add it to the beginning of the path (in case
another adb is already in the path, we want to use the correct one)





 

[jbudorick, 2014/11/11 18:04:03]

This was previously inside android_commands.py because adb_interface.py used
'adb' without the full path specified. Now that you're giving AdbInterface the
full path to ADB, do we still need to do this?

[mikecase (-- gone --), 2014/11/11 19:36:01]

adb_interface.py no longer needs ADB to be in the path. However, Forwarder (and
who knows, maybe other things too) needs ADB to be in the path. 

+    os.environ['PATH'] = adb_dir + os.pathsep + os.environ['PATH']
   if options.environment not in constants.VALID_ENVIRONMENTS:
     error_func('--environment must be one of: %s' %
                ', '.join(constants.VALID_ENVIRONMENTS))
 
 
 def AddDeviceOptions(option_parser):
   group = optparse.OptionGroup(option_parser, 'Device Options')
   group.add_option('-c', dest='cleanup_test_files',
                    help='Cleanup test files on the device after run',
                    action='store_true')
@@ skipping 871 matching lines @@
 
 def main():
   signal.signal(signal.SIGUSR1, DumpThreadStacks)
   option_parser = command_option_parser.CommandOptionParser(
       commands_dict=VALID_COMMANDS)
   return command_option_parser.ParseAndExecute(option_parser)
 
 
 if __name__ == '__main__':
   sys.exit(main())