ci: Run tests with small textures

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 12aba9e58813a2dde02c9413dff9dc98dea81c9f..05366da2b28221170422fae7d3730342db8da25d 100644 (file)
--- 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 a4593532f347b226ce4c2a53de5a23e56cca685b..51e2db68fdf3d641a892bf141214c76f9a788225 100755 (executable)
--- 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)"