Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1426)

Unified Diff: testing/scripts/run_telemetry_benchmark_as_googletest.py

Issue 2008833002: allow usage of transparent visuals when using xvfb (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « testing/scripts/run_telemetry_as_googletest.py ('k') | testing/xvfb.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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
« no previous file with comments | « testing/scripts/run_telemetry_as_googletest.py ('k') | testing/xvfb.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698