diff options
| author | binji@chromium.org <binji@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-16 17:39:02 +0000 |
|---|---|---|
| committer | binji@chromium.org <binji@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-16 17:39:02 +0000 |
| commit | 6884b71a5b130be14cf1aae7dfd49056f0718461 (patch) | |
| tree | 34f19ebd64a2d8aa7e3e1d61a3919697b48169dc /native_client_sdk | |
| parent | 19898793854f8ea990bb075a2335399e2a04dccf (diff) | |
| download | chromium_src-6884b71a5b130be14cf1aae7dfd49056f0718461.zip chromium_src-6884b71a5b130be14cf1aae7dfd49056f0718461.tar.gz chromium_src-6884b71a5b130be14cf1aae7dfd49056f0718461.tar.bz2 | |
[NaCl SDK] Fix linux_nacl_sdk trybot -- it needs to clear http_proxy.
BUG=229470
R=sbc@chromium.org
Review URL: https://codereview.chromium.org/14210005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@194385 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'native_client_sdk')
| -rwxr-xr-x | native_client_sdk/src/build_tools/build_sdk.py | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/native_client_sdk/src/build_tools/build_sdk.py b/native_client_sdk/src/build_tools/build_sdk.py index 36d88b8..5f9fbeb 100755 --- a/native_client_sdk/src/build_tools/build_sdk.py +++ b/native_client_sdk/src/build_tools/build_sdk.py @@ -810,7 +810,14 @@ def BuildStepTarBundle(pepper_ver, tarfile): def BuildStepRunUnittests(): buildbot_common.BuildStep('Run unittests') test_all_py = os.path.join(SDK_SRC_DIR, 'test_all.py') - buildbot_common.Run([sys.executable, test_all_py]) + + # Our tests shouldn't be using the proxy; they should all be connecting to + # localhost. Some slaves can't route HTTP traffic through the proxy to + # localhost (we get 504 gateway errors), so we clear it here. + env = dict(os.environ) + if 'http_proxy' in env: + del env['http_proxy'] + buildbot_common.Run([sys.executable, test_all_py], env=env) def BuildStepTestSDK(): |