client/tools/buildbot_annotated_steps.py - Issue 12674025: Add java to PATH on windows bots and run ia32 editor tests instead of x64 on windows

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: client/tools/buildbot_annotated_steps.py

Issue 12674025: Add java to PATH on windows bots and run ia32 editor tests instead of x64 on windows (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart

Patch Set: Created 7 years, 9 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: client/tools/buildbot_annotated_steps.py

diff --git a/client/tools/buildbot_annotated_steps.py b/client/tools/buildbot_annotated_steps.py

index 4eabfeb9857a4c632f57c40cc1d984c5d5edbab0..c4242550291c7a4b4da8aaebc1c28fb5adcb180b 100755

--- a/client/tools/buildbot_annotated_steps.py

+++ b/client/tools/buildbot_annotated_steps.py

@@ -133,9 +133,11 @@ def FixJavaHome():

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

- print 'Setting java home to'

- print java_home

+ os.environ['PATH'] = '%s;%s' % (java_bin, os.environ['PATH'])

+ print 'Setting java home to ', java_home

sys.stdout.flush()

def ClobberBuilder():

« no previous file with comments | « no previous file | tools/bots/editor.py » ('j') | no next file with comments »