From 3d2d5cd334cddf419da464531448c33038f09f56 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20=C3=85dahl?= Date: Sat, 13 Feb 2021 18:49:58 +0100 Subject: [PATCH] ci: Enable native backend and screen cast tests With the surfaceless mode in the headless backend, it's now possible to initiate the headless mode without any mode setting devices, or render nodes, without any special CI runner privileges. The native backend tests include screen cast tests, so make them possible to run by starting pipewire. Testing shows that enabling audio support (pulseaudio & jack compat layers) makes the tests dead lock and eventually timeout, so disable those features for now. Part-of: --- .gitlab-ci.yml | 4 ++-- .gitlab-ci/run-tests.sh | 7 +++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 32612bff6..19ce3c520 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -191,7 +191,7 @@ build-fedora-container@aarch64: - .fdo.distribution-image@fedora stage: build script: - - meson . build -Dbuildtype=debugoptimized -Db_coverage=true -Degl_device=true -Dwayland_eglstream=true -Dnative_tests=false --werror --prefix /usr + - meson . build -Dbuildtype=debugoptimized -Db_coverage=true -Degl_device=true -Dwayland_eglstream=true --werror --prefix /usr - ninja -C build - ninja -C build install artifacts: @@ -221,7 +221,7 @@ build-without-opengl-and-glx@x86_64: needs: - build-fedora-container@x86_64 script: - - meson . build -Dbuildtype=debugoptimized -Dopengl=false -Dglx=false -Degl_device=true -Dwayland_eglstream=true -Dnative_tests=false --werror --prefix /usr + - meson . build -Dbuildtype=debugoptimized -Dopengl=false -Dglx=false -Degl_device=true -Dwayland_eglstream=true --werror --prefix /usr - ninja -C build - ninja -C build install artifacts: diff --git a/.gitlab-ci/run-tests.sh b/.gitlab-ci/run-tests.sh index 34c66b992..b0a3d7dd1 100755 --- a/.gitlab-ci/run-tests.sh +++ b/.gitlab-ci/run-tests.sh @@ -5,6 +5,13 @@ set -e dconf update glib-compile-schemas $GSETTINGS_SCHEMA_DIR +# Disable audio support to not dead lock screen cast tests +rm -f /etc/pipewire/media-session.d/with-jack +rm -f /etc/pipewire/media-session.d/with-pulseaudio +pipewire & + +sleep 2 + export MUTTER_DEBUG_DUMMY_MODE_SPECS="800x600@10.0" xvfb-run -s '+iglx -noreset' \