ci: Enable 'catch' backtrace generation

catch needs to be able to use ptrace(); asan builders allow this, so tag
the test steps with asan and asan-aarch64 to make them run on capable
runners.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2561>
This commit is contained in:
Jonas Ådahl 2022-08-19 15:39:41 +02:00
parent 530d296a0c
commit d9030e02d1
2 changed files with 10 additions and 7 deletions

View File

@ -18,7 +18,7 @@ variables:
.mutter.fedora@common: .mutter.fedora@common:
variables: variables:
FDO_DISTRIBUTION_VERSION: 36 FDO_DISTRIBUTION_VERSION: 36
BASE_TAG: '2022-08-18.0' BASE_TAG: '2022-08-18.1'
FDO_DISTRIBUTION_PACKAGES: FDO_DISTRIBUTION_PACKAGES:
asciidoc asciidoc
clang clang
@ -68,11 +68,9 @@ variables:
https://gitlab.freedesktop.org/wayland/wayland-protocols.git \ https://gitlab.freedesktop.org/wayland/wayland-protocols.git \
1.26 . && 1.26 . &&
git clone https://github.com/zatrazz/glibc-tools.git && ./.gitlab-ci/install-meson-project.sh \
cd glibc-tools && https://gitlab.gnome.org/jadahl/catch.git \
./configure && make && make install && main . 29ad36e2b1d28ac9d8b2bc44af46296cb1db5d66 &&
cd .. &&
rm -rf glibc-tools &&
rpm -e --nodeps gnome-bluetooth-libs-devel \ rpm -e --nodeps gnome-bluetooth-libs-devel \
mutter mutter-devel \ mutter mutter-devel \
@ -242,6 +240,7 @@ check-code-style:
BASE_MESON_OPTIONS: BASE_MESON_OPTIONS:
-Degl_device=true -Degl_device=true
-Dwayland_eglstream=true -Dwayland_eglstream=true
-Dcatch=true
.build-mutter: .build-mutter:
extends: extends:
@ -379,6 +378,8 @@ test-mutter@x86_64:
extends: extends:
- .test-mutter - .test-mutter
- .mutter.fedora@x86_64 - .mutter.fedora@x86_64
tags:
- asan
needs: needs:
- build-mutter@x86_64 - build-mutter@x86_64
@ -404,6 +405,8 @@ test-mutter@aarch64:
extends: extends:
- .test-mutter - .test-mutter
- .mutter.fedora@aarch64 - .mutter.fedora@aarch64
tags:
- asan-aarch64
needs: needs:
- build-mutter@aarch64 - build-mutter@aarch64

View File

@ -5,4 +5,4 @@ set -e
wireplumber & wireplumber &
sleep 1 sleep 1
catchsegv meson "$@" meson "$@"