From 04224155006a672f37fb537953ec8776dfaec2bb Mon Sep 17 00:00:00 2001 From: Tom Krizek Date: Wed, 9 Aug 2023 15:42:05 +0200 Subject: [PATCH] ci: Disable dnsrps for respdiff jobs compiled with ASAN/TSAN The dnsrps build assumes that dlopen is available from libc. This assumption isn't met when attempting to build with address or thread sanitizer on debian (bullseye, bookworm). Disable dnsrps build to avoid the issue, since it's not needed anyway for our respdiff tests. See commit b396f555861f11d7d6cee2ceb0d94abb733e1101 for more info about the dnsrps build. --- .gitlab-ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 975e765bae..118d8deca6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1445,7 +1445,7 @@ respdiff-short:asan: CC: gcc CFLAGS: "${CFLAGS_COMMON} -Og -fsanitize=address,undefined" LDFLAGS: "-fsanitize=address,undefined" - EXTRA_CONFIGURE: "--without-jemalloc" + EXTRA_CONFIGURE: "--disable-dnsrps --without-jemalloc" MAX_DISAGREEMENTS_PERCENTAGE: "0.5" script: - bash respdiff.sh -s named -q "${PWD}/10k_a.txt" -c 3 -w "${PWD}/rspworkdir" "${CI_PROJECT_DIR}" "/usr/local/respdiff-reference-bind/sbin/named" @@ -1458,7 +1458,7 @@ respdiff-short:tsan: CC: gcc CFLAGS: "${CFLAGS_COMMON} -Og -fsanitize=thread" LDFLAGS: "-fsanitize=thread" - EXTRA_CONFIGURE: "--enable-pthread-rwlock --without-jemalloc" + EXTRA_CONFIGURE: "--disable-dnsrps --enable-pthread-rwlock --without-jemalloc" MAX_DISAGREEMENTS_PERCENTAGE: "0.5" TSAN_OPTIONS: "${TSAN_OPTIONS_DEBIAN}" script: @@ -1486,7 +1486,7 @@ respdiff-long:asan: CC: gcc CFLAGS: "${CFLAGS_COMMON} -Og -fsanitize=address,undefined" LDFLAGS: "-fsanitize=address,undefined" - EXTRA_CONFIGURE: "--without-jemalloc" + EXTRA_CONFIGURE: "--disable-dnsrps --without-jemalloc" MAX_DISAGREEMENTS_PERCENTAGE: "0.5" script: - bash respdiff.sh -s named -q "${PWD}/100k_mixed.txt" -c 3 -w "${PWD}/rspworkdir" "${CI_PROJECT_DIR}" "/usr/local/respdiff-reference-bind/sbin/named" @@ -1499,7 +1499,7 @@ respdiff-long:tsan: CC: gcc CFLAGS: "${CFLAGS_COMMON} -Og -fsanitize=thread" LDFLAGS: "-fsanitize=thread" - EXTRA_CONFIGURE: "--enable-pthread-rwlock --without-jemalloc" + EXTRA_CONFIGURE: "--disable-dnsrps --enable-pthread-rwlock --without-jemalloc" MAX_DISAGREEMENTS_PERCENTAGE: "0.5" TSAN_OPTIONS: "${TSAN_OPTIONS_DEBIAN}" script: