diff options
| author | Emil Velikov <emil.velikov@collabora.com> | 2021-07-13 15:04:25 +0100 |
|---|---|---|
| committer | Emil Velikov <emil.l.velikov@gmail.com> | 2021-07-13 15:06:28 +0100 |
| commit | 924a3b0b7e7cf8a9355cda7c3b8daaeb6759bfcf (patch) | |
| tree | d087bf6e3c379af814ac98ac6bd91bbde1f45457 | |
| parent | a2928750d75b0141fddfb3b52e39b6c241c2b4ac (diff) | |
| download | waffle-924a3b0b7e7cf8a9355cda7c3b8daaeb6759bfcf.tar.gz | |
gitlab-ci: use xvfb -noreset
Drop the gratuitous wait and use the -noreset Xvfb option. This should
resolve the intermittent fallouts that we're seeing.
Huge thanks goes to Pekka and Daniel for pointing it out.
Closes: https://gitlab.freedesktop.org/mesa/waffle/-/issues/70
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
| -rw-r--r-- | .gitlab-ci/build-meson.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitlab-ci/build-meson.sh b/.gitlab-ci/build-meson.sh index 0ff8067..989d1da 100644 --- a/.gitlab-ci/build-meson.sh +++ b/.gitlab-ci/build-meson.sh @@ -4,7 +4,7 @@ set -eu case $1 in x11) platform_option=(-Dglx=enabled -Dx11_egl=enabled) - test_wrapper=(xvfb-run -a -w10) + test_wrapper=(xvfb-run -a --server-args='-noreset') ;; wayland) platform_option=(-Dwayland=enabled) |