mirror of
https://github.com/dart-lang/sdk
synced 2024-09-16 03:36:59 +00:00
Add java to PATH on windows bots and run ia32 editor tests instead of x64 on windows
Review URL: https://codereview.chromium.org//12674025 git-svn-id: https://dart.googlecode.com/svn/branches/bleeding_edge/dart@20372 260f80e4-7a28-3924-810f-c04153c831b5
This commit is contained in:
parent
9834ddc96b
commit
12c1a842ba
|
@ -133,9 +133,11 @@ def FixJavaHome():
|
||||||
if buildbot_javahome:
|
if buildbot_javahome:
|
||||||
current_pwd = os.getenv('PWD')
|
current_pwd = os.getenv('PWD')
|
||||||
java_home = os.path.join(current_pwd, buildbot_javahome)
|
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['JAVA_HOME'] = java_home
|
||||||
print 'Setting java home to'
|
os.environ['PATH'] = '%s;%s' % (java_bin, os.environ['PATH'])
|
||||||
print java_home
|
|
||||||
|
print 'Setting java home to ', java_home
|
||||||
sys.stdout.flush()
|
sys.stdout.flush()
|
||||||
|
|
||||||
def ClobberBuilder():
|
def ClobberBuilder():
|
||||||
|
|
|
@ -35,6 +35,9 @@ def main():
|
||||||
build_py = os.path.join('tools', 'build.py')
|
build_py = os.path.join('tools', 'build.py')
|
||||||
architectures = ['ia32', 'x64']
|
architectures = ['ia32', 'x64']
|
||||||
test_architectures = ['x64']
|
test_architectures = ['x64']
|
||||||
|
if sys.platform == 'win32':
|
||||||
|
# Our windows bots pull in only a 32 bit JVM.
|
||||||
|
test_architectures = ['ia32']
|
||||||
|
|
||||||
for arch in architectures:
|
for arch in architectures:
|
||||||
with bot.BuildStep('Build Editor %s' % arch):
|
with bot.BuildStep('Build Editor %s' % arch):
|
||||||
|
|
Loading…
Reference in a new issue