use xvfb-run to launch Xvfb

diff --git a/.travis.yml b/.travis.yml
index 598857218ed11282be8f4519a9c7cc546ead4ad8..f83818b01b8743d3b3f9493253577dc70eb3323f 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,13 +17,5 @@ matrix:
     - env: "IMAGE=ubuntu-build:devel TARGETS=test"
     - env: "IMAGE=centos-build:latest TARGETS=test"
 
-before_script:
-  - "export DISPLAY=:99.0"
-  - "sh -e /etc/init.d/xvfb start"
-  - sleep 3 # give xvfb some time to start
-# really?
-# watch https://docs.travis-ci.com/user/gui-and-headless-browsers/ to
-# see if a less fragile version comes up (with services maybe)
-
 script:
     - bash scripts/docker/exec.bash

diff --git a/scripts/docker/exec.bash b/scripts/docker/exec.bash
index e55ce57de700c988020c7985f9bee9d01c85b771..faabff467b259a617162922154a933385ae6f879 100755 (executable)
--- a/scripts/docker/exec.bash
+++ b/scripts/docker/exec.bash
@@ -24,15 +24,10 @@ if [ -e "${image_path}/env" ]; then
        local_conf="$local_conf --env-file ${image_path}/env"
 fi
 
-# copy DISPLAY if set
-if [ "$DISPLAY" != "" ]; then
-       local_conf="$local_conf -e DISPLAY=$DISPLAY"
-fi
-
 # copy XDG_RUNTIME_DIR if set
 if [ "$XDG_RUNTIME_DIR" != "" ]; then
        local_conf="$local_conf -e XDG_RUNTIME_DIR='$XDG_RUNTIME_DIR'"
 fi
 
 docker build -t "${image_name}" --pull=true "${image_path}"
-docker run -v "$PWD":/repo ${local_conf} "${image_name}" /bin/bash -c "env && ${build_cmd}"
+docker run -v "$PWD":/repo ${local_conf} "${image_name}" xvfb-run --server-args="-screen 0 1024x768x24" bash -c "env ; glewinfo | head ; ${build_cmd}"