Commit 7b1c08fd authored by erg@chromium.org's avatar erg@chromium.org

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
parent d3d9b45b
...@@ -82,7 +82,7 @@ def run_executable(cmd, build_dir, env): ...@@ -82,7 +82,7 @@ def run_executable(cmd, build_dir, env):
"""Runs an executable within a xvfb buffer on linux or normally on other """Runs an executable within a xvfb buffer on linux or normally on other
platforms. 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 Detects recursion with an environment variable and do not create a recursive X
buffer if present. buffer if present.
...@@ -109,11 +109,11 @@ def run_executable(cmd, build_dir, env): ...@@ -109,11 +109,11 @@ def run_executable(cmd, build_dir, env):
# Some ChromeOS tests need a window manager. Technically, it could be # Some ChromeOS tests need a window manager. Technically, it could be
# another script but that would be overkill. # another script but that would be overkill.
try: try:
ice_cmd = ['icewm'] wm_cmd = ['openbox']
subprocess.Popen( subprocess.Popen(
ice_cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, env=env) wm_cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, env=env)
except OSError: 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 1
return test_env.run_executable(cmd, env) return test_env.run_executable(cmd, env)
finally: finally:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment