Fix android buildbot presubmit

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 copy
 import json
 import os
@@ skipping 16 matching lines @@
 def DictDiff(d1, d2):
   diff = []
   for key in sorted(set(d1.keys() + d2.keys())):
     if key in d1 and d1[key] != d2.get(key):
       diff.append('- %s=%s' % (key, pipes.quote(d1[key])))
     if key in d2 and d2[key] != d1.get(key):
       diff.append('+ %s=%s' % (key, pipes.quote(d2[key])))
   return '\n'.join(diff)
 
 
-def GetEnvironment(host_obj):
+def GetEnvironment(host_obj, testing):
   init_env = dict(os.environ)
   init_env['GYP_GENERATORS'] = 'ninja'
   init_env['GOMA_DIR'] = bb_utils.GOMA_DIR
   envsetup_cmd = '. build/android/envsetup.sh'
   if host_obj.target_arch:
     envsetup_cmd += ' --target_arch=%s' % host_obj.target_arch
-  print 'Running %s' % envsetup_cmd
+  if testing:
+    # Skip envsetup to avoid presubmit dependence on android deps.
+    print 'Testing mode - skipping "%s"' % envsetup_cmd
+    envsetup_cmd = ':'
+  else:
+    print 'Running %s' % envsetup_cmd
   proc = subprocess.Popen(['bash', '-exc',
     envsetup_cmd + ' >&2; python build/android/buildbot/env_to_json.py'],
     stdout=subprocess.PIPE, stderr=subprocess.PIPE,
     cwd=bb_utils.CHROME_SRC, env=init_env)
   json_env, envsetup_output = proc.communicate()
   if proc.returncode != 0:
-    print 'FATAL Failure in envsetup.'
-    print envsetup_output
+    print >> sys.stderr, 'FATAL Failure in envsetup.'
+    print >> sys.stderr, envsetup_output
     sys.exit(1)
   env = json.loads(json_env)
   env['GYP_DEFINES'] = env.get('GYP_DEFINES', '') + ' fastbuild=1'
   extra_gyp = host_obj.extra_gyp_defines
   if extra_gyp:
     env['GYP_DEFINES'] += ' %s' % extra_gyp
     if re.search('(asan|clang)=1', extra_gyp):
       env.pop('CXX_target', None)
 
   # Bots checkout chrome in /b/build/slave/<name>/build/src
@@ skipping 136 matching lines @@
       bot_config = bot_map[max_id]
   if not bot_config:
     print 'Error: config for id="%s" cannot be inferred.' % bot_id
     return 1
 
   print 'Using config:', bot_config
 
   commands = GetCommands(options, bot_config)
   for command in commands:
     print 'Will run: ', bb_utils.CommandToString(command)
+  print
 
-  env = GetEnvironment(bot_config.host_obj)
+  env = GetEnvironment(bot_config.host_obj, options.testing)
   print 'Environment changes:'
   print DictDiff(dict(os.environ), env)
 
   for command in commands:
     print bb_utils.CommandToString(command)
     sys.stdout.flush()
     if options.testing:
       env['BUILDBOT_TESTING'] = '1'
     return_code = subprocess.call(command, cwd=bb_utils.CHROME_SRC, env=env)
     if return_code != 0:
       return return_code
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))