summaryrefslogtreecommitdiffstats
path: root/testing/xvfb.py
diff options
context:
space:
mode:
authorerg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-05 20:31:11 +0000
committererg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-05 20:31:11 +0000
commit7b1c08fdb4a802122291200ff932e45399b654a5 (patch)
tree8ad496b9a0723b1bec67d82316fad9b69b5131ae /testing/xvfb.py
parentd3d9b45b22b1fd15c320e128dab39571077011af (diff)
downloadchromium_src-7b1c08fdb4a802122291200ff932e45399b654a5.zip
chromium_src-7b1c08fdb4a802122291200ff932e45399b654a5.tar.gz
chromium_src-7b1c08fdb4a802122291200ff932e45399b654a5.tar.bz2
Migrate to Openbox from IceWM (In chrome scripts)
BUG=125106 R=maruel@chromium.org Review URL: https://codereview.chromium.org/55083004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@233071 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'testing/xvfb.py')
-rwxr-xr-xtesting/xvfb.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/testing/xvfb.py b/testing/xvfb.py
index 6ac0056..51c1ad3 100755
--- a/testing/xvfb.py
+++ b/testing/xvfb.py
@@ -82,7 +82,7 @@ def run_executable(cmd, build_dir, env):
"""Runs an executable within a xvfb buffer on linux or normally on other
platforms.
- Requires that both xvfb and icewm are installed on linux.
+ Requires that both xvfb and openbox are installed on linux.
Detects recursion with an environment variable and do not create a recursive X
buffer if present.
@@ -109,11 +109,11 @@ def run_executable(cmd, build_dir, env):
# Some ChromeOS tests need a window manager. Technically, it could be
# another script but that would be overkill.
try:
- ice_cmd = ['icewm']
+ wm_cmd = ['openbox']
subprocess.Popen(
- ice_cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, env=env)
+ wm_cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, env=env)
except OSError:
- print >> sys.stderr, 'Failed to run %s' % ' '.join(ice_cmd)
+ print >> sys.stderr, 'Failed to run %s' % ' '.join(wm_cmd)
return 1
return test_env.run_executable(cmd, env)
finally: