From af879941156c882dc18b74557a8894e6b6fcc31b Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Tue, 5 Nov 2024 13:09:35 -0500
Subject: [PATCH 1/2] ci: Try to use llvm-symbolizer

It might help get some stacktraces out of crashes in asan.
---
 .gitlab-ci/run-tests.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci/run-tests.sh b/.gitlab-ci/run-tests.sh
index 8932d23473..d1718357b2 100755
--- a/.gitlab-ci/run-tests.sh
+++ b/.gitlab-ci/run-tests.sh
@@ -11,7 +11,9 @@ multiplier=${MESON_TEST_TIMEOUT_MULTIPLIER:-1}
 n_processes=${MESON_TEST_MAX_PROCESSES:-1}
 
 # Ignore memory leaks lower in dependencies
-export LSAN_OPTIONS=suppressions=$srcdir/lsan.supp:print_suppressions=0:detect_leaks=0:allocator_may_return_null=1
+export LSAN_OPTIONS=suppressions=$srcdir/lsan.supp:print_suppressions=0:detect_leaks=0:allocator_may_return_null=1:symbolize=1
+export ASAN_SYMBOLIZER_PATH=/usr/bin/llvm-symbolizer
+
 
 case "${setup}" in
   x11*)

From 6f59f1f5a43c6cfe35f2988d3f5166c9d9b3f6f5 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Tue, 5 Nov 2024 13:17:42 -0500
Subject: [PATCH 2/2] ci: Use meson junit output

Just use the junit xml that is produced by meson, it works now.
---
 .gitlab-ci.yml          | 12 +++++-------
 .gitlab-ci/run-tests.sh |  7 -------
 2 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 281a9d857c..6fd8acde99 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -62,18 +62,16 @@ style-check-diff:
 .build-fedora-default:
   image: $FEDORA_IMAGE
   artifacts:
+    name: "gtk-${CI_COMMIT_REF_NAME}"
     when: always
     reports:
       junit:
-        - "${CI_PROJECT_DIR}/_build/report-x11.xml"
-        - "${CI_PROJECT_DIR}/_build/report-wayland.xml"
-        - "${CI_PROJECT_DIR}/_build/report-wayland_gl.xml"
-        - "${CI_PROJECT_DIR}/_build/report-broadway.xml"
-    name: "gtk-${CI_COMMIT_REF_NAME}"
+        - "${CI_PROJECT_DIR}/_build/meson-logs/testlog-x11.junit.xml"
+        - "${CI_PROJECT_DIR}/_build/meson-logs/testlog-wayland.junit.xml"
+        - "${CI_PROJECT_DIR}/_build/meson-logs/testlog-wayland_gl.junit.xml"
+        - "${CI_PROJECT_DIR}/_build/meson-logs/testlog-broadway.junit.xml"
     paths:
       - "${CI_PROJECT_DIR}/_build/meson-logs"
-      - "${CI_PROJECT_DIR}/_build/report*.xml"
-      - "${CI_PROJECT_DIR}/_build/report*.html"
       - "${CI_PROJECT_DIR}/_build/testsuite/reftests/output/*/*.png"
       - "${CI_PROJECT_DIR}/_build/testsuite/reftests/output/*/*.node"
       - "${CI_PROJECT_DIR}/_build/testsuite/tools/output/*/*"
diff --git a/.gitlab-ci/run-tests.sh b/.gitlab-ci/run-tests.sh
index d1718357b2..dba31cd592 100755
--- a/.gitlab-ci/run-tests.sh
+++ b/.gitlab-ci/run-tests.sh
@@ -95,13 +95,6 @@ esac
 
 cd ${builddir}
 
-$srcdir/.gitlab-ci/meson-junit-report.py \
-            --project-name=gtk \
-            --backend="${setup}" \
-            --job-id="${CI_JOB_NAME}" \
-            --output="report-${setup}.xml" \
-            "meson-logs/testlog-${setup}.json"
-
 $srcdir/.gitlab-ci/meson-html-report.py \
             --project-name=gtk \
             --backend="${setup}" \