Add android buildbot support for exe tests

build/android/buildbot/bb_run_bot.py

 #!/usr/bin/env python
 #
 # Copyright (c) 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 collections
 import json
 import optparse
 import os
 import pipes
 import subprocess
 import sys
 
 sys.path.append(os.path.join(os.path.dirname(__file__), '..'))
 from pylib import buildbot_report
 
 CHROME_SRC = os.path.abspath(
     os.path.join(os.path.dirname(__file__), '..', '..', '..'))
 
 GLOBAL_SLAVE_PROPS = {}
 
 BotConfig = collections.namedtuple(
     'BotConfig', ['bot_id', 'bash_funs', 'test_obj', 'slave_props'])
 TestConfig = collections.namedtuple('Tests', ['tests', 'extra_args'])
-Command = collections.namedtuple('Command', ['step_name', 'command'])
+Command = collections.namedtuple(
+    'Command', ['step_name', 'command', 'testing_cmd'])
 
 
 def GetCommands(options, bot_config):
   """Get a formatted list of commands.
 
   Args:
     options: Options object.
     bot_config: A BotConfig named tuple.
   Returns:
     list of Command objects.
   """
   slave_props = dict(GLOBAL_SLAVE_PROPS)
   if bot_config.slave_props:
     slave_props.update(bot_config.slave_props)
 
   property_args = [
       '--factory-properties=%s' % json.dumps(options.factory_properties),
       '--build-properties=%s' % json.dumps(options.build_properties),
       '--slave-properties=%s' % json.dumps(slave_props)]
 
   commands = []
+  def WrapWithBash(command):
+    """Wrap a bash command string with envsetup scripts."""
+    return ['bash', '-exc', '; '.join([
+        '. build/android/buildbot/buildbot_functions.sh',
+        'bb_baseline_setup %s %s' % (
+             CHROME_SRC,
+             ' '.join(map(pipes.quote, property_args))),
+        command])
+    ]
+
   if bot_config.bash_funs:
-    bash_base = [
-        '. build/android/buildbot/buildbot_functions.sh',
-        "bb_baseline_setup %s '%s'" %
-        (CHROME_SRC, "' '".join(property_args))]
-    commands.append(Command(
-        None, ['bash', '-exc', '; '.join(bash_base + bot_config.bash_funs)]))
+    # bash_funs command does not have a testing mode.
+    commands.append(
+        Command(None, WrapWithBash('; '.join(bot_config.bash_funs)), None))
 
   test_obj = bot_config.test_obj
   if test_obj:
     run_test_cmd = [
         'build/android/buildbot/bb_device_steps.py', '--reboot'] + property_args
     for test in test_obj.tests:
       run_test_cmd.extend(['-f', test])
     if test_obj.extra_args:
       run_test_cmd.extend(test_obj.extra_args)
-    commands.append(Command('Run tests', run_test_cmd))
+    commands.append(Command(
+        'Run tests',
+        WrapWithBash(' '.join(map(pipes.quote, run_test_cmd))), run_test_cmd))
 
   return commands
 
 
 def GetBotStepMap():
   compile_step = ['bb_compile']
   std_build_steps = ['bb_compile', 'bb_zip_build']
   std_test_steps = ['bb_extract_build']
   std_tests = ['ui', 'unit']
 
@@ skipping 106 matching lines @@
     print 'Will run:', CommandToString(command_obj.command)
 
   for command_obj in command_objs:
     if command_obj.step_name:
       buildbot_report.PrintNamedStep(command_obj.step_name)
     command = command_obj.command
     print CommandToString(command)
     sys.stdout.flush()
     env = None
     if options.TESTING:
-      # The bash command doesn't yet support the testing option.
-      if command[0] == 'bash':
+      if not command_obj.testing_cmd:
         continue
-      env = dict(os.environ)
-      env['BUILDBOT_TESTING'] = '1'
-
-    return_code = subprocess.call(command, cwd=CHROME_SRC, env=env)
+      return_code = subprocess.call(
+          command_obj.testing_cmd,
+          cwd=CHROME_SRC,
+          env=dict(os.environ, BUILDBOT_TESTING='1'))
+    else:
+      return_code = subprocess.call(command, cwd=CHROME_SRC, env=env)
     if return_code != 0:
       return return_code
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))