Index: testing/test_env.py |
diff --git a/testing/test_env.py b/testing/test_env.py |
index 4c194277bf33090c31097025cf7c85064413a10a..3fe9bdbe957ec4e568055ac1091c155d3e704d25 100755 |
--- a/testing/test_env.py |
+++ b/testing/test_env.py |
@@ -17,43 +17,12 @@ CHROME_SANDBOX_ENV = 'CHROME_DEVEL_SANDBOX' |
CHROME_SANDBOX_PATH = '/opt/chromium/chrome_sandbox' |
-def should_enable_sandbox(cmd, sandbox_path): |
- """Return a boolean indicating that the current slave is capable of using the |
- sandbox and should enable it. This should return True iff the slave is a |
- Linux host with the sandbox file present and configured correctly.""" |
- if not (sys.platform.startswith('linux') and |
- os.path.exists(sandbox_path)): |
- return False |
- |
- # Copy the check in tools/build/scripts/slave/runtest.py. |
- if '--lsan=1' in cmd: |
- return False |
- |
- sandbox_stat = os.stat(sandbox_path) |
- if ((sandbox_stat.st_mode & stat.S_ISUID) and |
- (sandbox_stat.st_mode & stat.S_IRUSR) and |
- (sandbox_stat.st_mode & stat.S_IXUSR) and |
- (sandbox_stat.st_uid == 0)): |
- return True |
- return False |
- |
- |
-def get_sandbox_env(cmd, env, verbose=False): |
+def get_sandbox_env(env): |
"""Checks enables the sandbox if it is required, otherwise it disables it. |
jln (very slow on Chromium)
2015/01/27 20:19:48
This comment doesn't seem to match what we wish to
earthdok
2015/01/27 20:44:44
Done.
|
Returns the environment flags to set.""" |
extra_env = {} |
chrome_sandbox_path = env.get(CHROME_SANDBOX_ENV, CHROME_SANDBOX_PATH) |
jln (very slow on Chromium)
2015/01/27 20:19:48
Could you add a check that CHROME_SANDBOX_ENV is n
earthdok
2015/01/27 20:44:44
Done.
|
- |
- if should_enable_sandbox(cmd, chrome_sandbox_path): |
- if verbose: |
- print 'Enabling sandbox. Setting environment variable:' |
- print ' %s="%s"' % (CHROME_SANDBOX_ENV, chrome_sandbox_path) |
- extra_env[CHROME_SANDBOX_ENV] = chrome_sandbox_path |
- else: |
- if verbose: |
- print 'Disabling sandbox. Setting environment variable:' |
- print ' CHROME_DEVEL_SANDBOX=""' |
- extra_env['CHROME_DEVEL_SANDBOX'] = '' |
+ extra_env[CHROME_SANDBOX_ENV] = chrome_sandbox_path |
return extra_env |
@@ -135,7 +104,7 @@ def run_executable(cmd, env): |
"""Runs an executable with: |
- environment variable CR_SOURCE_ROOT set to the root directory. |
- environment variable LANGUAGE to en_US.UTF-8. |
- - environment variable CHROME_DEVEL_SANDBOX set if need |
+ - environment variable CHROME_DEVEL_SANDBOX set |
- Reuses sys.executable automatically. |
""" |
extra_env = {} |
@@ -144,7 +113,7 @@ def run_executable(cmd, env): |
# 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(cmd, env)) |
+ extra_env.update(get_sandbox_env(env)) |
# Copy logic from tools/build/scripts/slave/runtest.py. |
asan = '--asan=1' in cmd |