summaryrefslogtreecommitdiffstats
path: root/testing
diff options
context:
space:
mode:
authorglider <glider@chromium.org>2014-10-09 09:24:56 -0700
committerCommit bot <commit-bot@chromium.org>2014-10-09 16:25:09 +0000
commitb73f187227abebe0be6671ac0cf7690ba4f75ca9 (patch)
tree237b2ec9577ac9bf622f3b27c308d3f38ee89466 /testing
parent9f6fde290ca5a86291bdf9e89bd7388fa0bb7487 (diff)
downloadchromium_src-b73f187227abebe0be6671ac0cf7690ba4f75ca9.zip
chromium_src-b73f187227abebe0be6671ac0cf7690ba4f75ca9.tar.gz
chromium_src-b73f187227abebe0be6671ac0cf7690ba4f75ca9.tar.bz2
Convert env to a defaultdict in run_executable() to fix other callers of that function.
This is a follow-up for https://codereview.chromium.org/642643003/ that should fix ASan Linux bots. BUG=None TBR=jam@chromium.org,agable@chromium.org Review URL: https://codereview.chromium.org/646603003 Cr-Commit-Position: refs/heads/master@{#298898}
Diffstat (limited to 'testing')
-rwxr-xr-xtesting/test_env.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/testing/test_env.py b/testing/test_env.py
index 67b6d86..2c39508 100755
--- a/testing/test_env.py
+++ b/testing/test_env.py
@@ -72,6 +72,7 @@ def run_executable(cmd, env):
- environment variable CHROME_DEVEL_SANDBOX set if need
- Reuses sys.executable automatically.
"""
+ env = collections.defaultdict(str, env)
# Many tests assume a English interface...
env['LANG'] = 'en_US.UTF-8'
# Used by base/base_paths_linux.cc as an override. Just make sure the default
@@ -115,8 +116,7 @@ def run_executable(cmd, env):
def main():
- return run_executable(sys.argv[1:],
- collections.defaultdict(str, os.environ.copy()))
+ return run_executable(sys.argv[1:], os.environ.copy())
if __name__ == '__main__':