summaryrefslogtreecommitdiffstats
path: root/testing
diff options
context:
space:
mode:
authorjln@chromium.org <jln@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-25 17:03:06 +0000
committerjln@chromium.org <jln@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-25 17:03:06 +0000
commit0d26489735be545dce0fd94913a7f5e2fca5e951 (patch)
tree53818f8a837e54b467cbe48ce5a4c50bac446f40 /testing
parentabad5199503d283393af73b2e59bc44516f10a6b (diff)
downloadchromium_src-0d26489735be545dce0fd94913a7f5e2fca5e951.zip
chromium_src-0d26489735be545dce0fd94913a7f5e2fca5e951.tar.gz
chromium_src-0d26489735be545dce0fd94913a7f5e2fca5e951.tar.bz2
testing/test_env.py: don't silently disable the sandbox
If the sandbox is not installed, don't silently disable it. BUG=245376 NOTRY=true Review URL: https://chromiumcodereview.appspot.com/17648002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@208512 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'testing')
-rwxr-xr-xtesting/test_env.py8
1 files changed, 5 insertions, 3 deletions
diff --git a/testing/test_env.py b/testing/test_env.py
index feca609..a65b34b 100755
--- a/testing/test_env.py
+++ b/testing/test_env.py
@@ -44,9 +44,11 @@ def enable_sandbox_if_required(env, verbose=False):
env[CHROME_SANDBOX_ENV] = chrome_sandbox_path
else:
if verbose:
- print 'Disabling sandbox. Setting environment variable:'
- print ' %s=""' % CHROME_SANDBOX_ENV
- env[CHROME_SANDBOX_ENV] = ''
+ print 'Sandbox not properly installed. Unsetting:'
+ 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)
def fix_python_path(cmd):