From d9030e02d1917abe9fe3005ed6a8978f24581117 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>
Date: Fri, 19 Aug 2022 15:39:41 +0200
Subject: [PATCH] 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>
---
 .gitlab-ci.yml          | 15 +++++++++------
 .gitlab-ci/run-meson.sh |  2 +-
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2163ddc14..0b5e49e76 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -18,7 +18,7 @@ variables:
 .mutter.fedora@common:
   variables:
     FDO_DISTRIBUTION_VERSION: 36
-    BASE_TAG: '2022-08-18.0'
+    BASE_TAG: '2022-08-18.1'
     FDO_DISTRIBUTION_PACKAGES:
       asciidoc
       clang
@@ -68,11 +68,9 @@ variables:
         https://gitlab.freedesktop.org/wayland/wayland-protocols.git \
         1.26 . &&
 
-      git clone https://github.com/zatrazz/glibc-tools.git &&
-      cd glibc-tools &&
-      ./configure && make && make install &&
-      cd .. &&
-      rm -rf glibc-tools &&
+      ./.gitlab-ci/install-meson-project.sh \
+        https://gitlab.gnome.org/jadahl/catch.git \
+        main . 29ad36e2b1d28ac9d8b2bc44af46296cb1db5d66 &&
 
       rpm -e --nodeps gnome-bluetooth-libs-devel \
                       mutter mutter-devel \
@@ -242,6 +240,7 @@ check-code-style:
     BASE_MESON_OPTIONS:
       -Degl_device=true
       -Dwayland_eglstream=true
+      -Dcatch=true
 
 .build-mutter:
   extends:
@@ -379,6 +378,8 @@ test-mutter@x86_64:
   extends:
     - .test-mutter
     - .mutter.fedora@x86_64
+  tags:
+    - asan
   needs:
     - build-mutter@x86_64
 
@@ -404,6 +405,8 @@ test-mutter@aarch64:
   extends:
     - .test-mutter
     - .mutter.fedora@aarch64
+  tags:
+    - asan-aarch64
   needs:
     - build-mutter@aarch64
 
diff --git a/.gitlab-ci/run-meson.sh b/.gitlab-ci/run-meson.sh
index 16a20f621..759117e2e 100755
--- a/.gitlab-ci/run-meson.sh
+++ b/.gitlab-ci/run-meson.sh
@@ -5,4 +5,4 @@ set -e
 wireplumber &
 sleep 1
 
-catchsegv meson "$@"
+meson "$@"