From: Tom Krizek <tkrizek@isc.org>
Date: Mon, 26 Jun 2023 14:40:03 +0000 (+0200)
Subject: Disable delv tests under TSAN
X-Git-Tag: v9.19.15~12^2~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fbcf37f914ed83cab374e01d13e0ce302c87ab52;p=thirdparty%2Fbind9.git

Disable delv tests under TSAN

Since delv can occasionally hang in system tests when running with TSAN
(see GL#4119), disable these tests as a workaround. Otherwise, the hung
delv process will just waste CI resources and prevent any meaningful
output from the rest of the test suite.
---

diff --git a/bin/tests/system/conf.sh.in b/bin/tests/system/conf.sh.in
index d15791696b7..bb1cfd8f36f 100644
--- a/bin/tests/system/conf.sh.in
+++ b/bin/tests/system/conf.sh.in
@@ -27,7 +27,11 @@ export ARPANAME=$TOP_BUILDDIR/bin/tools/arpaname
 export CDS=$TOP_BUILDDIR/bin/dnssec/dnssec-cds
 export CHECKCONF=$TOP_BUILDDIR/bin/check/named-checkconf
 export CHECKZONE=$TOP_BUILDDIR/bin/check/named-checkzone
-export DELV=$TOP_BUILDDIR/bin/delv/delv
+if [ -z "$TSAN_OPTIONS" ]; then  # workaround for GL#4119
+    export DELV=$TOP_BUILDDIR/bin/delv/delv
+else
+    export DELV=:
+fi
 export DIG=$TOP_BUILDDIR/bin/dig/dig
 export DNSTAPREAD=$TOP_BUILDDIR/bin/tools/dnstap-read
 export DSFROMKEY=$TOP_BUILDDIR/bin/dnssec/dnssec-dsfromkey