Move the pkcs11-provider prereq.sh check to a marker

enginepkcs11 also needs softhsm2, so its prereq.sh keeps that check
for now.

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

diff --git a/bin/tests/system/enginepkcs11/prereq.sh b/bin/tests/system/enginepkcs11/prereq.sh
index 335b348a63ddad4526c9e8d8be95459f8e5ed141..be1850a1fadb7af311f68dea6583be26425c66c9 100644 (file)
--- a/bin/tests/system/enginepkcs11/prereq.sh
+++ b/bin/tests/system/enginepkcs11/prereq.sh
@@ -13,11 +13,6 @@
 
 . ../conf.sh
 
-[ "prereq/var/tmp/etc/openssl-provider.cnf" = "prereq${OPENSSL_CONF}" ] || {
-  echo_i "skip: pkcs11-provider not enabled"
-  exit 255
-}
-
 [ -n "${SOFTHSM2_CONF}" ] || {
   echo_i "skip: softhsm2 configuration not available"
   exit 255

diff --git a/bin/tests/system/enginepkcs11/tests_sh_enginepkcs11.py b/bin/tests/system/enginepkcs11/tests_sh_enginepkcs11.py
index 089ac7ea604ab6f44b963d0c5c0818aa7133b87e..42f26e31f3ed699b47ca4f53e5f6e77eaa8315de 100644 (file)
--- a/bin/tests/system/enginepkcs11/tests_sh_enginepkcs11.py
+++ b/bin/tests/system/enginepkcs11/tests_sh_enginepkcs11.py
@@ -11,7 +11,9 @@
 
 import pytest
 
-pytestmark = pytest.mark.extra_artifacts(
+import isctest.mark
+
+EXTRA_ARTIFACTS = pytest.mark.extra_artifacts(
     [
         "dig.out.*",
         "dsset-*",
@@ -48,6 +50,11 @@ pytestmark = pytest.mark.extra_artifacts(
     ]
 )
 
+pytestmark = [
+    isctest.mark.with_pkcs11_provider,
+    EXTRA_ARTIFACTS,
+]
+
 
 @pytest.mark.flaky(max_runs=5)  # GL#4605
 def test_enginepkcs11(run_tests_sh):

diff --git a/bin/tests/system/isctest/mark.py b/bin/tests/system/isctest/mark.py
index 9aa9e2daefceea75de7c8466a92b33824105d2b2..5debabb2bf6e714a2168078a15daa897f4edeee7 100644 (file)
--- a/bin/tests/system/isctest/mark.py
+++ b/bin/tests/system/isctest/mark.py
@@ -150,6 +150,11 @@ softhsm2_environment = pytest.mark.skipif(
     reason="SOFTHSM2_CONF and SOFTHSM2_MODULE environmental variables must be set and pkcs11-tool and softhsm2-util tools present",
 )
 
+with_pkcs11_provider = pytest.mark.skipif(
+    os.path.basename(os.getenv("OPENSSL_CONF") or "") != "openssl-provider.cnf",
+    reason="pkcs11-provider not enabled",
+)
+
 
 def have_ipv6():
     sock = socket.socket(socket.AF_INET6, socket.SOCK_STREAM)