diff options
| -rw-r--r-- | .gitlab-ci.yml | 1 | ||||
| -rwxr-xr-x | .gitlab-ci/run-tests.sh | 29 |
2 files changed, 2 insertions, 28 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 12aba9e588..05366da2b2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -105,6 +105,7 @@ fedora-x86_64: - .gitlab-ci/run-tests.sh _build x11 - .gitlab-ci/run-tests.sh _build wayland - .gitlab-ci/run-tests.sh _build waylandgles + - .gitlab-ci/run-tests.sh _build wayland_smalltexture - .gitlab-ci/run-tests.sh _build broadway release-build: diff --git a/.gitlab-ci/run-tests.sh b/.gitlab-ci/run-tests.sh index a4593532f3..51e2db68fd 100755 --- a/.gitlab-ci/run-tests.sh +++ b/.gitlab-ci/run-tests.sh @@ -36,7 +36,7 @@ case "${backend}" in --suite=failing || true ;; - wayland) + wayland*) export XDG_RUNTIME_DIR="$(mktemp -p $(pwd) -d xdg-runtime-XXXXXX)" weston --backend=headless-backend.so --socket=wayland-5 --idle-time=0 & @@ -63,33 +63,6 @@ case "${backend}" in kill ${compositor} ;; - waylandgles) - export XDG_RUNTIME_DIR="$(mktemp -p $(pwd) -d xdg-runtime-XXXXXX)" - - weston --backend=headless-backend.so --socket=wayland-6 --idle-time=0 & - compositor=$! - export WAYLAND_DISPLAY=wayland-6 - - meson test -C ${builddir} \ - --timeout-multiplier "${MESON_TEST_TIMEOUT_MULTIPLIER}" \ - --print-errorlogs \ - --setup=${backend} \ - --suite=gtk \ - --no-suite=failing \ - --no-suite=flaky \ - --no-suite=gsk-compare-broadway - exit_code=$? - - meson test -C ${builddir} \ - --timeout-multiplier "${MESON_TEST_TIMEOUT_MULTIPLIER}" \ - --print-errorlogs \ - --setup=${backend}_unstable \ - --suite=flaky \ - --suite=failing || true - - kill ${compositor} - ;; - broadway) export XDG_RUNTIME_DIR="$(mktemp -p $(pwd) -d xdg-runtime-XXXXXX)" |