mirror of
https://gitlab.isc.org/isc-projects/bind9
synced 2025-09-01 23:25:38 +00:00
chg: test: For TSAN builds, use libraries from /opt/tsan
The new TSAN images, the TSAN-enabled images install libraries to opt/tsan, synchronize the configure options and CFLAGS between gcc:tsan and clang:tsan images and set the PKG_CONFIG_PATH to /opt/tsan/lib. Additionally, drop Debian bullseye that's EOL now. Merge branch 'ondrej/use-staging-tsan-images' into 'main' See merge request isc-projects/bind9!9324
This commit is contained in:
@@ -147,10 +147,6 @@ stages:
|
|||||||
|
|
||||||
# Debian
|
# Debian
|
||||||
|
|
||||||
.debian-bullseye-amd64: &debian_bullseye_amd64_image
|
|
||||||
image: "$CI_REGISTRY_IMAGE:debian-bullseye-amd64"
|
|
||||||
<<: *linux_amd64
|
|
||||||
|
|
||||||
.debian-bookworm-amd64: &debian_bookworm_amd64_image
|
.debian-bookworm-amd64: &debian_bookworm_amd64_image
|
||||||
image: "$CI_REGISTRY_IMAGE:debian-bookworm-amd64"
|
image: "$CI_REGISTRY_IMAGE:debian-bookworm-amd64"
|
||||||
<<: *linux_amd64
|
<<: *linux_amd64
|
||||||
@@ -1265,9 +1261,9 @@ unit:clang:asan:
|
|||||||
gcc:tsan:
|
gcc:tsan:
|
||||||
variables:
|
variables:
|
||||||
CC: gcc
|
CC: gcc
|
||||||
CFLAGS: "${CFLAGS_COMMON} -Wno-stringop-overread -ggdb -O2 -fsanitize=thread -Wl,-rpath=/usr/local/lib -Wl,--enable-new-dtags"
|
CFLAGS: "${CFLAGS_COMMON} -Wno-stringop-overread -ggdb -O2 -fsanitize=thread"
|
||||||
LDFLAGS: "-fsanitize=thread"
|
LDFLAGS: "-fsanitize=thread"
|
||||||
EXTRA_CONFIGURE: "--with-libidn2 --enable-pthread-rwlock --without-jemalloc PKG_CONFIG_PATH=/usr/local/lib/pkgconfig"
|
EXTRA_CONFIGURE: "--with-libidn2 --enable-pthread-rwlock --without-jemalloc PKG_CONFIG_PATH=/opt/tsan/lib/pkgconfig"
|
||||||
<<: *tsan_fedora_40_amd64_image
|
<<: *tsan_fedora_40_amd64_image
|
||||||
<<: *build_job
|
<<: *build_job
|
||||||
|
|
||||||
@@ -1294,9 +1290,9 @@ clang:tsan:
|
|||||||
<<: *build_job
|
<<: *build_job
|
||||||
variables:
|
variables:
|
||||||
CC: "${CLANG}"
|
CC: "${CLANG}"
|
||||||
CFLAGS: "${CFLAGS_COMMON} -fsanitize=thread"
|
CFLAGS: "${CFLAGS_COMMON} -ggdb -O2 -fsanitize=thread"
|
||||||
LDFLAGS: "-fsanitize=thread"
|
LDFLAGS: "-fsanitize=thread"
|
||||||
EXTRA_CONFIGURE: "--with-libidn2 --enable-pthread-rwlock --without-jemalloc"
|
EXTRA_CONFIGURE: "--with-libidn2 --enable-pthread-rwlock --without-jemalloc PKG_CONFIG_PATH=/opt/tsan/lib/pkgconfig"
|
||||||
|
|
||||||
system:clang:tsan:
|
system:clang:tsan:
|
||||||
variables:
|
variables:
|
||||||
@@ -1316,52 +1312,6 @@ unit:clang:tsan:
|
|||||||
- job: clang:tsan
|
- job: clang:tsan
|
||||||
artifacts: true
|
artifacts: true
|
||||||
|
|
||||||
# Jobs for Debian 11 "bullseye" (amd64)
|
|
||||||
|
|
||||||
clang:bullseye:amd64:
|
|
||||||
variables:
|
|
||||||
CC: ${CLANG}
|
|
||||||
CFLAGS: "${CFLAGS_COMMON} -Wenum-conversion"
|
|
||||||
<<: *debian_bullseye_amd64_image
|
|
||||||
<<: *build_job
|
|
||||||
|
|
||||||
system:clang:bullseye:amd64:
|
|
||||||
<<: *debian_bullseye_amd64_image
|
|
||||||
<<: *system_test_job
|
|
||||||
needs:
|
|
||||||
- job: clang:bullseye:amd64
|
|
||||||
artifacts: true
|
|
||||||
|
|
||||||
unit:clang:bullseye:amd64:
|
|
||||||
<<: *debian_bullseye_amd64_image
|
|
||||||
<<: *unit_test_job
|
|
||||||
needs:
|
|
||||||
- job: clang:bullseye:amd64
|
|
||||||
artifacts: true
|
|
||||||
|
|
||||||
gcc:bullseye:amd64:
|
|
||||||
variables:
|
|
||||||
CC: gcc
|
|
||||||
CFLAGS: "${CFLAGS_COMMON}"
|
|
||||||
# See https://gitlab.isc.org/isc-projects/bind9/-/issues/3444
|
|
||||||
EXTRA_CONFIGURE: "--with-libidn2 --without-jemalloc --disable-leak-detection"
|
|
||||||
<<: *debian_bullseye_amd64_image
|
|
||||||
<<: *build_job
|
|
||||||
|
|
||||||
system:gcc:bullseye:amd64:
|
|
||||||
<<: *debian_bullseye_amd64_image
|
|
||||||
<<: *system_test_job
|
|
||||||
needs:
|
|
||||||
- job: gcc:bullseye:amd64
|
|
||||||
artifacts: true
|
|
||||||
|
|
||||||
unit:gcc:bullseye:amd64:
|
|
||||||
<<: *debian_bullseye_amd64_image
|
|
||||||
<<: *unit_test_job
|
|
||||||
needs:
|
|
||||||
- job: gcc:bullseye:amd64
|
|
||||||
artifacts: true
|
|
||||||
|
|
||||||
# Jobs for Clang builds on Debian 12 "bookworm" (amd64)
|
# Jobs for Clang builds on Debian 12 "bookworm" (amd64)
|
||||||
|
|
||||||
clang:bookworm:amd64:
|
clang:bookworm:amd64:
|
||||||
@@ -1623,7 +1573,7 @@ respdiff:tsan:
|
|||||||
CC: gcc
|
CC: gcc
|
||||||
CFLAGS: "${CFLAGS_COMMON} -Og -fsanitize=thread"
|
CFLAGS: "${CFLAGS_COMMON} -Og -fsanitize=thread"
|
||||||
LDFLAGS: "-fsanitize=thread"
|
LDFLAGS: "-fsanitize=thread"
|
||||||
EXTRA_CONFIGURE: "--disable-dnsrps --enable-pthread-rwlock --without-jemalloc"
|
EXTRA_CONFIGURE: "--disable-dnsrps --enable-pthread-rwlock --without-jemalloc PKG_CONFIG_PATH=/opt/tsan/lib/pkgconfig"
|
||||||
MAX_DISAGREEMENTS_PERCENTAGE: "0.5"
|
MAX_DISAGREEMENTS_PERCENTAGE: "0.5"
|
||||||
TSAN_OPTIONS: "${TSAN_OPTIONS_DEBIAN}"
|
TSAN_OPTIONS: "${TSAN_OPTIONS_DEBIAN}"
|
||||||
script:
|
script:
|
||||||
|
Reference in New Issue
Block a user