From: Nicki Křížek <nicki@isc.org>
Date: Wed, 1 Jul 2026 13:40:06 +0000 (+0000)
Subject: Move TSAN prereq.sh checks to a without_tsan marker
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=0b32acb9b9a6cc61e9af0d044a890df2fe78c957;p=thirdparty%2Fbind9.git

Move TSAN prereq.sh checks to a without_tsan marker

Gates dlzexternal and dyndb, which are skipped under ThreadSanitizer.

Assisted-by: Claude:claude-opus-4-8
---

diff --git a/bin/tests/system/dlzexternal/prereq.sh b/bin/tests/system/dlzexternal/prereq.sh
deleted file mode 100644
index f7591d74f23..00000000000
--- a/bin/tests/system/dlzexternal/prereq.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/sh
-
-# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-#
-# SPDX-License-Identifier: MPL-2.0
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0.  If a copy of the MPL was not distributed with this
-# file, you can obtain one at https://mozilla.org/MPL/2.0/.
-#
-# See the COPYRIGHT file distributed with this work for additional
-# information regarding copyright ownership.
-
-. ../conf.sh
-
-$FEATURETEST --tsan && {
-  echo_i "TSAN - skipping dlzexternal test"
-  exit 255
-}
-
-exit 0
diff --git a/bin/tests/system/dlzexternal/tests_sh_dlzexternal.py b/bin/tests/system/dlzexternal/tests_sh_dlzexternal.py
index e64ecda6a64..a330de125ec 100644
--- a/bin/tests/system/dlzexternal/tests_sh_dlzexternal.py
+++ b/bin/tests/system/dlzexternal/tests_sh_dlzexternal.py
@@ -11,7 +11,9 @@
 
 import pytest
 
-pytestmark = pytest.mark.extra_artifacts(
+import isctest.mark
+
+EXTRA_ARTIFACTS = pytest.mark.extra_artifacts(
     [
         "dig.out.*",
         "ns1/ddns.key",
@@ -19,6 +21,11 @@ pytestmark = pytest.mark.extra_artifacts(
     ]
 )
 
+pytestmark = [
+    isctest.mark.without_tsan,
+    EXTRA_ARTIFACTS,
+]
+
 
 def test_dlzexternal(run_tests_sh):
     run_tests_sh()
diff --git a/bin/tests/system/dyndb/prereq.sh b/bin/tests/system/dyndb/prereq.sh
deleted file mode 100644
index 3bab2a62b5b..00000000000
--- a/bin/tests/system/dyndb/prereq.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/sh
-
-# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-#
-# SPDX-License-Identifier: MPL-2.0
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0.  If a copy of the MPL was not distributed with this
-# file, you can obtain one at https://mozilla.org/MPL/2.0/.
-#
-# See the COPYRIGHT file distributed with this work for additional
-# information regarding copyright ownership.
-
-. ../conf.sh
-
-$FEATURETEST --tsan && {
-  echo_i "TSAN - skipping dyndb test"
-  exit 255
-}
-
-exit 0
diff --git a/bin/tests/system/dyndb/tests_sh_dyndb.py b/bin/tests/system/dyndb/tests_sh_dyndb.py
index dab651d007c..9a81135dd18 100644
--- a/bin/tests/system/dyndb/tests_sh_dyndb.py
+++ b/bin/tests/system/dyndb/tests_sh_dyndb.py
@@ -11,7 +11,9 @@
 
 import pytest
 
-pytestmark = pytest.mark.extra_artifacts(
+import isctest.mark
+
+EXTRA_ARTIFACTS = pytest.mark.extra_artifacts(
     [
         "added.*",
         "deleted.*",
@@ -19,6 +21,11 @@ pytestmark = pytest.mark.extra_artifacts(
     ]
 )
 
+pytestmark = [
+    isctest.mark.without_tsan,
+    EXTRA_ARTIFACTS,
+]
+
 
 def test_dyndb(run_tests_sh):
     run_tests_sh()
diff --git a/bin/tests/system/isctest/mark.py b/bin/tests/system/isctest/mark.py
index 19a9fa1e2c0..ad82258649b 100644
--- a/bin/tests/system/isctest/mark.py
+++ b/bin/tests/system/isctest/mark.py
@@ -117,6 +117,10 @@ with_geoip2 = pytest.mark.skipif(
     os.getenv("FEATURE_GEOIP2") != "1", reason="GeoIP2 support disabled in the build"
 )
 
+without_tsan = pytest.mark.skipif(
+    os.getenv("FEATURE_TSAN") == "1", reason="incompatible with ThreadSanitizer (TSAN)"
+)
+
 softhsm2_environment = pytest.mark.skipif(
     not (
         os.getenv("SOFTHSM2_CONF")