| Index: testing/scripts/run_telemetry_benchmark_as_googletest.py
|
| diff --git a/testing/scripts/run_telemetry_benchmark_as_googletest.py b/testing/scripts/run_telemetry_benchmark_as_googletest.py
|
| index 39af8f015dbc81fa5a14e696d8790478c06e3002..387c5c8da95993f984f20522253b471eca93a58d 100755
|
| --- a/testing/scripts/run_telemetry_benchmark_as_googletest.py
|
| +++ b/testing/scripts/run_telemetry_benchmark_as_googletest.py
|
| @@ -48,14 +48,16 @@ def main():
|
| args, rest_args = parser.parse_known_args()
|
| xvfb_proc = None
|
| openbox_proc = None
|
| + xcompmgr_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'
|
| + xvfb_proc, openbox_proc, xcompmgr_proc = xvfb.start_xvfb(env=env,
|
| + build_dir='.')
|
| + assert xvfb_proc and openbox_proc and xcompmgr_proc, 'Failed to start xvfb'
|
| try:
|
| tempfile_dir = tempfile.mkdtemp('telemetry')
|
| valid = True
|
| @@ -92,6 +94,7 @@ def main():
|
| finally:
|
| xvfb.kill(xvfb_proc)
|
| xvfb.kill(openbox_proc)
|
| + xvfb.kill(xcompmgr_proc)
|
|
|
|
|
| # This is not really a "script test" so does not need to manually add
|
|
|