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.

(cherry picked from commit fbcf37f914ed83cab374e01d13e0ce302c87ab52)

diff --git a/bin/tests/system/conf.sh.in b/bin/tests/system/conf.sh.in
index 0ef94436e3298fa2ab60a2261562d5e1f611d0ce..0e7431ff6debf67998d0ef41ce8b83199d05de25 100644 (file)
--- 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