diff options
| author | binji@chromium.org <binji@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-05 16:23:15 +0000 |
|---|---|---|
| committer | binji@chromium.org <binji@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-05 16:23:15 +0000 |
| commit | 87126ad30bb4d0d875433c74424d66e11db76758 (patch) | |
| tree | 89fe620275a4004d77f234b79297bf68e55d68cb /native_client_sdk | |
| parent | 00579b55389f3ab8c0b58be1c251e86d2c0a3cb5 (diff) | |
| download | chromium_src-87126ad30bb4d0d875433c74424d66e11db76758.zip chromium_src-87126ad30bb4d0d875433c74424d66e11db76758.tar.gz chromium_src-87126ad30bb4d0d875433c74424d66e11db76758.tar.bz2 | |
[NaCl SDK] Fix windows builder location of gsutil.
This change fixes the windows-sdk-multi and windows-sdk-multirel builders.
Now that we build on S:, gsutil needs to be explicitly referenced at E:
BUG=none
R=sbc@chromium.org
Review URL: https://codereview.chromium.org/16379005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@204276 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'native_client_sdk')
| -rw-r--r-- | native_client_sdk/src/build_tools/buildbot_common.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/native_client_sdk/src/build_tools/buildbot_common.py b/native_client_sdk/src/build_tools/buildbot_common.py index 4de37f8..e8b215625 100644 --- a/native_client_sdk/src/build_tools/buildbot_common.py +++ b/native_client_sdk/src/build_tools/buildbot_common.py @@ -159,12 +159,17 @@ def RemoveFile(dst): BOT_GSUTIL = '/b/build/scripts/slave/gsutil' +# On Windows, the current working directory may be on a different drive than +# gsutil. +WIN_BOT_GSUTIL = 'E:' + BOT_GSUTIL LOCAL_GSUTIL = 'gsutil' def GetGsutil(): if os.environ.get('BUILDBOT_BUILDERNAME') \ and not os.environ.get('BUILDBOT_FAKE'): + if sys.platform in ('cygwin', 'win32'): + return WIN_BOT_GSUTIL return BOT_GSUTIL else: return LOCAL_GSUTIL |