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 (file)
index f7591d7..0000000
--- 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 e64ecda6a6434709495ec8056cb73923e6c07d88..a330de125ecb2b18d9cfe92f254849beb601a7d5 100644 (file)
--- 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 (file)
index 3bab2a6..0000000
--- 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 dab651d007cde428b31013321a931a5d96dcdb03..9a81135dd188eaede70976b8231379548abfddf5 100644 (file)
--- 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 19a9fa1e2c00c970c6139628139291b6a523fb68..ad82258649b91d08060c6d1f95355961a2c2466e 100644 (file)
--- 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")