diff options
Diffstat (limited to 'chromium/testing/test_env.py')
| -rwxr-xr-x | chromium/testing/test_env.py | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/chromium/testing/test_env.py b/chromium/testing/test_env.py index 6abd1a44bca..7ed4a7dde7c 100755 --- a/chromium/testing/test_env.py +++ b/chromium/testing/test_env.py @@ -17,24 +17,6 @@ import time # This is hardcoded to be src/ relative to this script. ROOT_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) -CHROME_SANDBOX_ENV = 'CHROME_DEVEL_SANDBOX' -CHROME_SANDBOX_PATH = '/opt/chromium/chrome_sandbox' - - -def get_sandbox_env(env): - """Returns the environment flags needed for the SUID sandbox to work.""" - extra_env = {} - chrome_sandbox_path = env.get(CHROME_SANDBOX_ENV, CHROME_SANDBOX_PATH) - # The above would silently disable the SUID sandbox if the env value were - # an empty string. We don't want to allow that. http://crbug.com/245376 - # TODO(jln): Remove this check once it's no longer possible to disable the - # sandbox that way. - if not chrome_sandbox_path: - chrome_sandbox_path = CHROME_SANDBOX_PATH - extra_env[CHROME_SANDBOX_ENV] = chrome_sandbox_path - - return extra_env - def trim_cmd(cmd): """Removes internal flags from cmd since they're just used to communicate from @@ -324,7 +306,6 @@ def run_executable(cmd, env, stdoutfile=None, cwd=None): # Used by base/base_paths_linux.cc as an override. Just make sure the default # logic is used. env.pop('CR_SOURCE_ROOT', None) - extra_env.update(get_sandbox_env(env)) # Copy logic from tools/build/scripts/slave/runtest.py. asan = '--asan=1' in cmd |