diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2022-12-20 06:04:46 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2022-12-20 06:04:46 +0000 |
| commit | 1b816c91d04e195768fecf1cccc0036d2400b9c1 (patch) | |
| tree | 3823657f999aa7a67e76438083bef064040b79df | |
| parent | 47b5d0d546e8773b1cceb9a06c220347462618d0 (diff) | |
| parent | 5df0cbfa6917a9d514942325b708930935443164 (diff) | |
| download | gtk+-1b816c91d04e195768fecf1cccc0036d2400b9c1.tar.gz | |
Merge branch 'fix-asan-more' into 'main'
ci: Disable f16c for asan
See merge request GNOME/gtk!5356
| -rw-r--r-- | .gitlab-ci.yml | 6 | ||||
| -rwxr-xr-x | .gitlab-ci/run-tests.sh | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6decaec976..7338279661 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -345,8 +345,8 @@ static-scan: - _scan_build/meson-logs allow_failure: true -# Run tests with the address sanitizer. We need to turn off introspection, -# since it is incompatible with asan +# Run tests with the address sanitizer. We need to turn off introspection +# and f16c, since they are incompatible with asan asan-build: image: $FEDORA_IMAGE tags: [ asan ] @@ -356,7 +356,7 @@ asan-build: script: - export PATH="$HOME/.local/bin:$PATH" - pip3 install --user meson~=0.64 - - CC=clang meson setup --buildtype=debugoptimized -Db_sanitize=address -Db_lundef=false -Dintrospection=disabled _build + - CC=clang meson setup --buildtype=debugoptimized -Db_sanitize=address -Db_lundef=false -Dintrospection=disabled -Df16c=disabled _build - ninja -C _build - .gitlab-ci/run-tests.sh _build wayland artifacts: diff --git a/.gitlab-ci/run-tests.sh b/.gitlab-ci/run-tests.sh index b60c3b38cc..a4593532f3 100755 --- a/.gitlab-ci/run-tests.sh +++ b/.gitlab-ci/run-tests.sh @@ -8,7 +8,7 @@ builddir=$1 backend=$2 # 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:verbosity=1:log_threads=1 export G_SLICE=always-malloc case "${backend}" in |