From: Nicki Křížek <nicki@isc.org>
Date: Thu, 18 Sep 2025 08:39:22 +0000 (+0200)
Subject: Re-enable delv tests with TSAN
X-Git-Tag: v9.21.14~27^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7e118fdb0690f1ce1d8ec016aae3d6c29e0d9f17;p=thirdparty%2Fbind9.git

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.
---

diff --git a/bin/tests/system/dnssec/tests_delv.py b/bin/tests/system/dnssec/tests_delv.py
index 2e6f2f26c9b..61ab35a7ac6 100644
--- a/bin/tests/system/dnssec/tests_delv.py
+++ b/bin/tests/system/dnssec/tests_delv.py
@@ -18,35 +18,32 @@ import pytest
 import isctest
 
 
-pytestmark = [
-    pytest.mark.skipif(bool(os.getenv("TSAN_OPTIONS", "")), reason="TSAN"),
-    pytest.mark.extra_artifacts(
-        [
-            "*/K*",
-            "*/dsset-*",
-            "*/*.bk",
-            "*/*.conf",
-            "*/*.db",
-            "*/*.id",
-            "*/*.jnl",
-            "*/*.jbk",
-            "*/*.key",
-            "*/*.signed",
-            "*/settime.out.*",
-            "ans*/ans.run",
-            "*/trusted.keys",
-            "*/*.bad",
-            "*/*.next",
-            "*/*.stripped",
-            "*/*.tmp",
-            "*/*.stage?",
-            "*/*.patched",
-            "*/*.lower",
-            "*/*.upper",
-            "*/*.unsplit",
-        ]
-    ),
-]
+pytestmark = pytest.mark.extra_artifacts(
+    [
+        "*/K*",
+        "*/dsset-*",
+        "*/*.bk",
+        "*/*.conf",
+        "*/*.db",
+        "*/*.id",
+        "*/*.jnl",
+        "*/*.jbk",
+        "*/*.key",
+        "*/*.signed",
+        "*/settime.out.*",
+        "ans*/ans.run",
+        "*/trusted.keys",
+        "*/*.bad",
+        "*/*.next",
+        "*/*.stripped",
+        "*/*.tmp",
+        "*/*.stage?",
+        "*/*.patched",
+        "*/*.lower",
+        "*/*.upper",
+        "*/*.unsplit",
+    ]
+)
 
 
 # helper functions
diff --git a/bin/tests/system/isctest/vars/basic.py b/bin/tests/system/isctest/vars/basic.py
index 690088c3c03..07709d4ebbf 100644
--- a/bin/tests/system/isctest/vars/basic.py
+++ b/bin/tests/system/isctest/vars/basic.py
@@ -22,6 +22,7 @@ BASIC_VARS = {
     "CDS": f"{BUILD_VARS['TOP_BUILDDIR']}/dnssec-cds",
     "CHECKCONF": f"{BUILD_VARS['TOP_BUILDDIR']}/named-checkconf",
     "CHECKZONE": f"{BUILD_VARS['TOP_BUILDDIR']}/named-checkzone",
+    "DELV": f"{BUILD_VARS['TOP_BUILDDIR']}/delv",
     "DIG": f"{BUILD_VARS['TOP_BUILDDIR']}/dig",
     "DNSTAPREAD": f"{BUILD_VARS['TOP_BUILDDIR']}/dnstap-read",
     "DSFROMKEY": f"{BUILD_VARS['TOP_BUILDDIR']}/dnssec-dsfromkey",
@@ -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"{BUILD_VARS['TOP_BUILDDIR']}/delv"
-        if not os.getenv("TSAN_OPTIONS", "")
-        else ":"  # workaround for GL#4119
-    ),
     "LC_ALL": "C",
     "ANS_LOG_LEVEL": "debug",
     "DYLIB": ("dylib" if os.uname().sysname == "Darwin" else "so"),