From 80be56f89b93a098ddad8af0da04cbbe1a35cc42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicki=20K=C5=99=C3=AD=C5=BEek?= Date: Thu, 18 Sep 2025 10:39:22 +0200 Subject: [PATCH] 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) --- bin/tests/system/isctest/vars/basic.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/bin/tests/system/isctest/vars/basic.py b/bin/tests/system/isctest/vars/basic.py index e76e5f12c3..9096df4886 100644 --- 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", }