Weston is added to the build dependencies, and is now run by xvfb.py.

Igalia · Jan 21, 2019 · f4c0623 · f4c0623
1 parent 7c53993
commit f4c0623
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/build/install-build-deps.sh b/build/install-build-deps.sh
@@ -185,6 +185,7 @@ dev_list="\
   ruby
   subversion
   uuid-dev
+  weston
   wdiff
   x11-utils
   xcompmgr

diff --git a/testing/xvfb.py b/testing/xvfb.py
@@ -75,13 +75,19 @@ 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: