From e23fcdd28b38e9fccd7d6c44cfe830d24ca649fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20=C3=85dahl?= Date: Mon, 6 Apr 2020 14:42:28 +0200 Subject: [PATCH] ci: Run mutter stacking tests These tests test mutter/gtk interaction, and is part of the mutter test suite. It uses a special gtk3-test branch on the upstream mutter repository, that is currently based on the gnome-3-36 branch. --- .gitlab-ci.yml | 27 +++++++++++++++++++++++++++ .gitlab-ci/test-docker-meson.sh | 1 + 2 files changed, 28 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 176564f4b78..4d8d201cab5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,5 +1,6 @@ stages: - build + - test - docs cache: @@ -91,3 +92,29 @@ msys2-mingw32-autotools: script: - C:\msys64\usr\bin\pacman --noconfirm -Syyuu - C:\msys64\usr\bin\bash -lc "bash -x ./.gitlab-ci/test-msys2-autotools.sh" + +fedora-mutter: + image: registry.gitlab.gnome.org/gnome/mutter/master:v3 + stage: test + variables: + XDG_RUNTIME_DIR: "$CI_PROJECT_DIR/runtime-dir" + GSETTINGS_SCHEMA_DIR: "$CI_PROJECT_DIR/mutter/build/data" + NO_AT_BRIDGE: "1" + script: + - dnf -y install pip + - dnf -y builddep gtk3 + - ln -s /usr/bin/gio-querymodules-$(getconf LONG_BIT) /usr/bin/gio-querymodules + - ./.gitlab-ci/test-docker-meson.sh + - ninja -C _build install + - cd $CI_PROJECT_DIR + - git clone -b gtk3-ci https://gitlab.gnome.org/GNOME/mutter.git + - cd mutter + - meson . build -Dbuildtype=debugoptimized -Degl_device=true -Dwayland_eglstream=true --werror --prefix /usr + - ninja -C build + - ninja -C build install + - dconf update + - mkdir -m 700 $XDG_RUNTIME_DIR + - glib-compile-schemas $GSETTINGS_SCHEMA_DIR + - > + dbus-run-session -- xvfb-run -s '+iglx -noreset' + meson test -C build --no-rebuild -t 10 --verbose --no-stdsplit --print-errorlogs --wrap catchsegv --suite mutter/stacking diff --git a/.gitlab-ci/test-docker-meson.sh b/.gitlab-ci/test-docker-meson.sh index 469af621f7e..a32d617d098 100755 --- a/.gitlab-ci/test-docker-meson.sh +++ b/.gitlab-ci/test-docker-meson.sh @@ -10,6 +10,7 @@ export PATH="${HOME}/.local/bin:${PATH}" python3 -m pip install --user meson==0.49.2 meson \ + -Dprefix=/usr \ -Dinstalled_tests=true \ -Dbroadway_backend=true \ -Dx11_backend=true \ -- GitLab