Re-enable delv tests with TSAN

With the loopmgr rewrite in 9.20, the delv issue shoud no longer happen,
thus the delv tests can be executed under TSAN as well.

(cherry picked from commit 7e118fdb0690f1ce1d8ec016aae3d6c29e0d9f17)

diff --git a/bin/tests/system/isctest/vars/basic.py b/bin/tests/system/isctest/vars/basic.py
index e76e5f12c3c2f908747e0c30391011aab9a27572..9096df488600260f01b9c9e6b392fe5b88017b92 100644 (file)
--- a/bin/tests/system/isctest/vars/basic.py
+++ b/bin/tests/system/isctest/vars/basic.py
@@ -23,6 +23,7 @@ BASIC_VARS = {
     "CHECKCONF": f"{AC_VARS['TOP_BUILDDIR']}/bin/check/named-checkconf",
     "CHECKZONE": f"{AC_VARS['TOP_BUILDDIR']}/bin/check/named-checkzone",
     "DIG": f"{AC_VARS['TOP_BUILDDIR']}/bin/dig/dig",
+    "DELV": f"{AC_VARS['TOP_BUILDDIR']}/bin/delv/delv",
     "DNSTAPREAD": f"{AC_VARS['TOP_BUILDDIR']}/bin/tools/dnstap-read",
     "DSFROMKEY": f"{AC_VARS['TOP_BUILDDIR']}/bin/dnssec/dnssec-dsfromkey",
     "FEATURETEST": f"{AC_VARS['TOP_BUILDDIR']}/bin/tests/system/feature-test",
@@ -54,11 +55,6 @@ BASIC_VARS = {
     "TMPDIR": os.getenv("TMPDIR", "/tmp"),
     "KRB5_CONFIG": "/dev/null",  # we don't want a KRB5_CONFIG setting breaking the tests
     "KRB5_KTNAME": "dns.keytab",  # use local keytab instead of default /etc/krb5.keytab
-    "DELV": (
-        f"{AC_VARS['TOP_BUILDDIR']}/bin/delv/delv"
-        if not os.getenv("TSAN_OPTIONS", "")
-        else ":"  # workaround for GL#4119
-    ),
     "LC_ALL": "C",
     "ANS_LOG_LEVEL": "debug",
 }