Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1448)

Unified Diff: native_client_sdk/src/build_tools/build_sdk.py

Issue 14210005: [NaCl SDK] Fix linux_nacl_sdk trybot -- it needs to clear http_proxy. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: feedback Created 7 years, 8 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: native_client_sdk/src/build_tools/build_sdk.py
diff --git a/native_client_sdk/src/build_tools/build_sdk.py b/native_client_sdk/src/build_tools/build_sdk.py
index 36d88b865d1af66528cd6a05fc99d4280725826e..5f9fbebc1789331c2c9ae8ed6eae78cc2b2f7f30 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():
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698