Also remove chromium specific boto config for cross-vm environment

client/tools/buildbot_annotated_steps.py

 #!/usr/bin/python
 # Copyright (c) 2011, the Dart project authors.  Please see the AUTHORS file
 # for details. All rights reserved. Use of this source code is governed by a
 # BSD-style license that can be found in the LICENSE file.
 
 # Copyright (c) 2011 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.
 
 """Dart client buildbot steps
@@ skipping 86 matching lines @@
 
   # TODO(devoncarew): should we move this into GetBuildInfo()?
   # get the latest changed revision from the current repository sub-tree
   version = GetLatestChangedRevision()
 
   utils = GetUtils()
   outdir = GetOutDir(utils, mode)
   cmds = [sys.executable, toolsBuildScript,
           '--mode=' + mode, '--revision=' + version,
           '--name=' + name, '--out=' + outdir]
-  local_env = os.environ.copy()
-  # The buildbot sets AWS_CREDENTIAL_FILE/BOTO_CONFIG to the chromium specific
-  # file, we use the one in home.
-  if 'BOTO_CONFIG' in local_env:
-    del local_env['BOTO_CONFIG']
-  if 'AWS_CREDENTIAL_FILE' in local_env:
-    del local_env['AWS_CREDENTIAL_FILE']
+  local_env = EnvironmentWithoutBotoConfig()
   #if 'linux' in name:
   #  javahome = os.path.join(os.path.expanduser('~'), 'jdk1.6.0_25')
   #  local_env['JAVA_HOME'] = javahome
   #  local_env['PATH'] = (os.path.join(javahome, 'bin') +
   #                       os.pathsep + local_env['PATH'])
 
   return subprocess.call(cmds, env=local_env)
 
-def ProcessBot(name, target):
+def EnvironmentWithoutBotoConfig(environment=None):
+  # The buildbot sets AWS_CREDENTIAL_FILE/BOTO_CONFIG to the chromium specific
+  # file, we use the one in home.
+  custom_env = dict(environment or os.environ)
+  if 'BOTO_CONFIG' in custom_env:
+    del custom_env['BOTO_CONFIG']
+  if 'AWS_CREDENTIAL_FILE' in custom_env:
+    del custom_env['AWS_CREDENTIAL_FILE']
+  return custom_env
+
+def ProcessBot(name, target, custom_env=None):
   '''
   Build and test the named bot target (compiler, android, pub). We look for
   the supporting script in tools/bots/ to run the tests and build.
   '''
   print 'Process%s' % target.capitalize()
-  has_shell=False
+  has_shell = False
+  environment = custom_env or os.environ
   if '-win' in name:
     # In Windows we need to run in the shell, so that we have all the
     # environment variables available.
-    has_shell=True
+    has_shell = True
   return subprocess.call([sys.executable,
       os.path.join('tools', 'bots', target + '.py')],
-      env=os.environ, shell=has_shell)
+      env=environment, shell=has_shell)
 
 def FixJavaHome():
   buildbot_javahome = os.getenv('BUILDBOT_JAVA_HOME')
   if buildbot_javahome:
     current_pwd = os.getenv('PWD')
     java_home = os.path.join(current_pwd, buildbot_javahome)
     java_bin = os.path.join(java_home, 'bin')
     os.environ['JAVA_HOME'] = java_home
     os.environ['PATH'] = '%s;%s' % (java_bin, os.environ['PATH'])
 
@@ skipping 69 matching lines @@
       # In case we're an FYI builder, run 'tools/bots/editor.py'.
       status = ProcessBot(name, 'editor')
     else:
       # Run the old annotated steps script
       status = ProcessTools('release', name, version)
   elif name.startswith('pub-'):
     status = ProcessBot(name, 'pub')
   elif name.startswith('vm-android'):
     status = ProcessBot(name, 'android')
   elif name.startswith('cross') or name.startswith('target'):
-    status = ProcessBot(name, 'cross-vm')
+    status = ProcessBot(name, 'cross-vm',
+                        custom_env=EnvironmentWithoutBotoConfig())
   else:
     status = ProcessBot(name, 'compiler')
 
   if status:
     print '@@@STEP_FAILURE@@@'
 
   return status
 
 
 if __name__ == '__main__':
   sys.exit(main())