From: Nicki Křížek <nicki@isc.org>
Date: Wed, 1 Jul 2026 13:40:07 +0000 (+0000)
Subject: Gate enginepkcs11 with the softhsm2_environment marker
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=fbc3d3d46f3df50b240cac45ae18f0527a6054f6;p=thirdparty%2Fbind9.git

Gate enginepkcs11 with the softhsm2_environment marker

Completes enginepkcs11's conversion, removing its prereq.sh.
softhsm2_environment already existed in isctest.mark.

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

diff --git a/bin/tests/system/enginepkcs11/prereq.sh b/bin/tests/system/enginepkcs11/prereq.sh
deleted file mode 100644
index be1850a1fad..00000000000
--- a/bin/tests/system/enginepkcs11/prereq.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/sh -e
-#
-# 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
-
-[ -n "${SOFTHSM2_CONF}" ] || {
-  echo_i "skip: softhsm2 configuration not available"
-  exit 255
-}
-
-[ -f "$SOFTHSM2_MODULE" ] || {
-  echo_i "skip: softhsm2 module not available"
-  exit 1
-}
-
-for _bin in softhsm2-util pkcs11-tool; do
-  command -v "$_bin" >/dev/null || {
-    echo_i "skip: $_bin not available"
-    exit 1
-  }
-done
diff --git a/bin/tests/system/enginepkcs11/tests_sh_enginepkcs11.py b/bin/tests/system/enginepkcs11/tests_sh_enginepkcs11.py
index 42f26e31f3e..7eacf4128e0 100644
--- a/bin/tests/system/enginepkcs11/tests_sh_enginepkcs11.py
+++ b/bin/tests/system/enginepkcs11/tests_sh_enginepkcs11.py
@@ -52,6 +52,7 @@ EXTRA_ARTIFACTS = pytest.mark.extra_artifacts(
 
 pytestmark = [
     isctest.mark.with_pkcs11_provider,
+    isctest.mark.softhsm2_environment,
     EXTRA_ARTIFACTS,
 ]