From 4d831ef9232a23e1ac7c12f529d24d47118eec56 Mon Sep 17 00:00:00 2001 From: "erg@chromium.org" Date: Thu, 7 Nov 2013 21:54:57 +0000 Subject: Revert 233116 "Revert 233071 "Migrate to Openbox from IceWM (In ..." openbox should theoretically be installed everywhere now. > Revert 233071 "Migrate to Openbox from IceWM (In chrome scripts)" > > Looks like openbox wasn't installed on everything. > > > Migrate to Openbox from IceWM (In chrome scripts) > > > > BUG=125106 > > R=maruel@chromium.org > > > > Review URL: https://codereview.chromium.org/55083004 > > BUG=125106, 308335 > TBR=erg@chromium.org > > Review URL: https://codereview.chromium.org/60343005 TBR=erg@chromium.org Review URL: https://codereview.chromium.org/61643009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@233702 0039d316-1c4b-4281-b951-d872f2087c98 --- testing/xvfb.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'testing') 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: -- cgit v1.1