diff options
| author | kbr <kbr@chromium.org> | 2015-12-07 21:06:33 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-12-08 05:07:23 +0000 |
| commit | 00ab61a366648ab624d9a7d6a248b2fa0caf8e5d (patch) | |
| tree | 23797b8ddf5d5b0ee9a6f431d4a46a898af50f74 /testing | |
| parent | 47570b9b206ca39fb55acc72e04fa3263a3dbd26 (diff) | |
| download | chromium_src-00ab61a366648ab624d9a7d6a248b2fa0caf8e5d.zip chromium_src-00ab61a366648ab624d9a7d6a248b2fa0caf8e5d.tar.gz chromium_src-00ab61a366648ab624d9a7d6a248b2fa0caf8e5d.tar.bz2 | |
Set CHROME_DEVEL_SANDBOX environment variable.
This logic is moving from recipes to the src-side script.
BUG=561863
Review URL: https://codereview.chromium.org/1507723003
Cr-Commit-Position: refs/heads/master@{#363743}
Diffstat (limited to 'testing')
| -rwxr-xr-x | testing/scripts/run_telemetry_benchmark_as_googletest.py | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/testing/scripts/run_telemetry_benchmark_as_googletest.py b/testing/scripts/run_telemetry_benchmark_as_googletest.py index c232bef..5715422 100755 --- a/testing/scripts/run_telemetry_benchmark_as_googletest.py +++ b/testing/scripts/run_telemetry_benchmark_as_googletest.py @@ -33,6 +33,11 @@ import common sys.path.append(os.path.join(os.path.dirname(__file__), '..')) import xvfb +# Unfortunately we need to copy these variables from ../test_env.py. +# Importing it and using its get_sandbox_env breaks test runs on Linux +# (it seems to unset DISPLAY). +CHROME_SANDBOX_ENV = 'CHROME_DEVEL_SANDBOX' +CHROME_SANDBOX_PATH = '/opt/chromium/chrome_sandbox' def main(): parser = argparse.ArgumentParser() @@ -44,6 +49,10 @@ def main(): xvfb_proc = None openbox_proc = None env = os.environ.copy() + # Assume we want to set up the sandbox environment variables all the + # time; doing so is harmless on non-Linux platforms and is needed + # all the time on Linux. + env[CHROME_SANDBOX_ENV] = CHROME_SANDBOX_PATH if args.xvfb and xvfb.should_start_xvfb(env): xvfb_proc, openbox_proc = xvfb.start_xvfb(env=env, build_dir='.') assert xvfb_proc and openbox_proc, 'Failed to start xvfb' |