summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2021-07-09 14:53:15 -0400
committerMatthias Clasen <mclasen@redhat.com>2021-07-09 14:53:15 -0400
commit7f0519b732369921f31a502784e89f9cf2a9b1c7 (patch)
tree7594f164ba7f3d1b560f06bdc0cca0df7a173ee6
parent59be04d7104bfcef5ae34a2e467725f5ced9f983 (diff)
downloadpango-7f0519b732369921f31a502784e89f9cf2a9b1c7.tar.gz
ci: Update ci images
Include llvm on the image, so that we can use llvm-symbolizer, too try and get meaningful stacktraces out of asan.
-rw-r--r--.gitlab-ci.yml2
-rw-r--r--.gitlab-ci/fedora.Dockerfile1
-rwxr-xr-x.gitlab-ci/run-tests.sh3
3 files changed, 4 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ed21f97e..bfe5f790 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,7 +8,7 @@ stages:
variables:
COMMON_MESON_FLAGS: "--fatal-meson-warnings --werror"
MESON_TEST_TIMEOUT_MULTIPLIER: 2
- FEDORA_IMAGE: registry.gitlab.gnome.org/gnome/pango/fedora:v5
+ FEDORA_IMAGE: registry.gitlab.gnome.org/gnome/pango/fedora:v6
.only-default:
only:
diff --git a/.gitlab-ci/fedora.Dockerfile b/.gitlab-ci/fedora.Dockerfile
index c047b6f2..ebb1e6b5 100644
--- a/.gitlab-ci/fedora.Dockerfile
+++ b/.gitlab-ci/fedora.Dockerfile
@@ -31,6 +31,7 @@ RUN dnf -y install \
libthai-devel \
libubsan \
libXft-devel \
+ llvm \
ninja-build \
python3 \
python3-jinja2 \
diff --git a/.gitlab-ci/run-tests.sh b/.gitlab-ci/run-tests.sh
index d82f1d08..683c031b 100755
--- a/.gitlab-ci/run-tests.sh
+++ b/.gitlab-ci/run-tests.sh
@@ -7,7 +7,8 @@ srcdir=$( pwd )
builddir=$1
# Ignore memory leaks lower in dependencies
-export LSAN_OPTIONS=suppressions=$srcdir/lsan.supp:print_suppressions=0
+export LSAN_OPTIONS=suppressions=$srcdir/lsan.supp:print_suppressions=0:symbolize=1
+export ASAN_SYMBOLIZER_PATH=/usr/bin/llvm-symbolizer
# Check leaks of slices
export G_SLICE=always-malloc