diff options
| author | jln@chromium.org <jln@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-25 19:34:35 +0000 |
|---|---|---|
| committer | jln@chromium.org <jln@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-25 19:34:35 +0000 |
| commit | f6e3214c5d9f55f15df7e5f482e6e591d76eacb5 (patch) | |
| tree | 483da5b1e8d19d0b42f6e73641996b07190e60de /testing | |
| parent | 73210d52e63841d12b9551243b5988462ad3c8c5 (diff) | |
| download | chromium_src-f6e3214c5d9f55f15df7e5f482e6e591d76eacb5.zip chromium_src-f6e3214c5d9f55f15df7e5f482e6e591d76eacb5.tar.gz chromium_src-f6e3214c5d9f55f15df7e5f482e6e591d76eacb5.tar.bz2 | |
Only remove CHROME_SANDBOX_ENV from env if it is present.
This will fix an error occuring on Windows.
(patch from csharp@chromium.org)
TBR=csharp
Review URL: https://codereview.chromium.org/17702004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@208535 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'testing')
| -rwxr-xr-x | testing/test_env.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/testing/test_env.py b/testing/test_env.py index a65b34b..ec98a11 100755 --- a/testing/test_env.py +++ b/testing/test_env.py @@ -48,7 +48,8 @@ def enable_sandbox_if_required(env, verbose=False): print ' %s' % CHROME_SANDBOX_ENV # The variable should be removed from the environment, making # the variable empty silently disables the sandbox. - env.pop(CHROME_SANDBOX_ENV) + if env.get(CHROME_SANDBOX_ENV): + env.pop(CHROME_SANDBOX_ENV) def fix_python_path(cmd): |