Skip to content

Commit

Permalink
Revert "Weston is added to the build dependencies, and is now run by …
Browse files Browse the repository at this point in the history
…xvfb.py."

This reverts commit 1497249.
  • Loading branch information
alex-voodoo committed Feb 4, 2019
1 parent c33eadf commit 122cd1a
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 7 deletions.
1 change: 0 additions & 1 deletion build/install-build-deps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,6 @@ dev_list="\
ruby
subversion
uuid-dev
weston
wdiff
x11-utils
xcompmgr
Expand Down
6 changes: 0 additions & 6 deletions testing/xvfb.py
Original file line number Diff line number Diff line change
Expand Up @@ -75,19 +75,13 @@ def run_executable(cmd, env, stdoutfile=None):
xcompmgr_proc = subprocess.Popen('xcompmgr', stdout=subprocess.PIPE,
stderr=subprocess.STDOUT, env=env)

# Tests may need a Wayland server.
weston_proc = subprocess.Popen(('weston', '--backend=x11-backend.so'),
stdout=subprocess.PIPE,
stderr=subprocess.STDOUT, env=env)

return test_env.run_executable(cmd, env, stdoutfile)
except OSError as e:
print >> sys.stderr, 'Failed to start Xvfb or Openbox: %s' % str(e)
return 1
finally:
kill(openbox_proc)
kill(xcompmgr_proc)
kill(weston_proc)
else:
env['_CHROMIUM_INSIDE_XVFB'] = '1'
if stdoutfile:
Expand Down

0 comments on commit 122cd1a

Please sign in to comment.