| Index: testing/xvfb.py
|
| diff --git a/testing/xvfb.py b/testing/xvfb.py
|
| index 6ac00567101857bf5d054e52247c5b22c4238864..51c1ad3ea2c55159c32d502d2d52778af14856b6 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:
|
|
|