Skip to content

Commit

Permalink
Migrate to Openbox from IceWM (In chrome scripts)
Browse files Browse the repository at this point in the history
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
  • Loading branch information
erg@chromium.org committed Nov 5, 2013
1 parent d3d9b45 commit 7b1c08f
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions testing/xvfb.py
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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:
Expand Down

0 comments on commit 7b1c08f

Please sign in to comment.