diff options
| author | bradnelson <bradnelson@google.com> | 2014-09-16 14:41:13 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-09-16 21:41:25 +0000 |
| commit | 68b33a1f165878f3ef383f5a9b66e233cc6fb137 (patch) | |
| tree | 37381947cf8158389f4b39c8ee040c74cdc5b298 | |
| parent | c267d1ed82d7911e06f63775ea26a07b0d718c45 (diff) | |
| download | chromium_src-68b33a1f165878f3ef383f5a9b66e233cc6fb137.zip chromium_src-68b33a1f165878f3ef383f5a9b66e233cc6fb137.tar.gz chromium_src-68b33a1f165878f3ef383f5a9b66e233cc6fb137.tar.bz2 | |
Fixing sdk gyp_vars mishandled in buildbot script.
The SDK has a dependency on an inner interface on the nacl side.
We use a fake to share code.
Updating the fake to actually provide what the nacl side expects.
BUG=None
TEST=trybots
R=sbc@chromium.org,binji@chromium.org
Review URL: https://codereview.chromium.org/575743006
Cr-Commit-Position: refs/heads/master@{#295148}
| -rw-r--r-- | native_client_sdk/src/build_tools/buildbot_common.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/native_client_sdk/src/build_tools/buildbot_common.py b/native_client_sdk/src/build_tools/buildbot_common.py index 2799fb4..7fad468 100644 --- a/native_client_sdk/src/build_tools/buildbot_common.py +++ b/native_client_sdk/src/build_tools/buildbot_common.py @@ -71,6 +71,9 @@ def GetWindowsEnvironment(): return self.env[key] def __getitem__(self, key): + # The nacl side script now needs gyp_vars to return a list. + if key == 'gyp_vars': + return [] return self.env[key] def SetEnv(self, key, value): @@ -80,7 +83,6 @@ def GetWindowsEnvironment(): self.env[key] = value context = FakeContext() - context['gyp_vars'] = [] buildbot_standard.SetupWindowsEnvironment(context) # buildbot_standard.SetupWindowsEnvironment adds the directory which contains @@ -97,7 +99,7 @@ def GetWindowsEnvironment(): # KEY1=VALUE1\r\n # KEY2=VALUE2\r\n # ... - return dict(line.split('=') for line in stdout.split('\r\n')[:-1]) + return dict(line.split('=', 1) for line in stdout.split('\r\n')[:-1]) def BuildStep(name): |