languages/dart-sdk
languages/dart-sdk
1
0
Fork 0
mirror of https://github.com/dart-lang/sdk synced 2024-10-14 09:01:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Also remove chromium specific boto config for cross-vm environment

Browse source 
R=ricow@google.com

Review URL: https://codereview.chromium.org//16968005

git-svn-id: https://dart.googlecode.com/svn/branches/bleeding_edge/dart@24020 260f80e4-7a28-3924-810f-c04153c831b5
This commit is contained in:
kustermann@google.com 2013-06-14 08:26:59 +00:00
parent 273806dcbb
commit 9451aa49a4
1 changed files with 18 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
client/tools/buildbot_annotated_steps.py
View file

@ -104,13 +104,7 @@ def ProcessTools(mode, name, version):
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
@ -119,20 +113,31 @@ def ProcessTools(mode, name, version):
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')
@ -222,7 +227,8 @@ def main():
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')