From: Matthijs Mekking <matthijs@isc.org>
Date: Tue, 10 Oct 2023 13:21:58 +0000 (+0200)
Subject: Only run pkcs11engine test if pkcs11-provider is available
X-Git-Tag: v9.19.22~70^2~11
X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=2e9fd6d0c11d0648589da5779baeefb5b98e855e;p=thirdparty%2Fbind9.git

Only run pkcs11engine test if pkcs11-provider is available

The bullseye and bookworm images are not set up with pkcs11-provider,
so we need to add an additional prerequisite for running the
pkcs11engine test. Check the path of OPENSSL_CONF.
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 22e86f800eb..99699f6a85b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -946,7 +946,7 @@ gcc:ossl3:sid:amd64:
   <<: *build_job
 
 system:gcc:ossl3:sid:amd64:
-  # Set up environment variables to run pkcs11-provider system tests
+  # Set up environment variables to run pkcs11-provider based system tests
   variables:
     OPENSSL_CONF: "/var/tmp/etc/openssl-provider.cnf"
     SOFTHSM2_CONF: "/var/tmp/softhsm2/softhsm2.conf"
diff --git a/bin/tests/system/enginepkcs11/prereq.sh b/bin/tests/system/enginepkcs11/prereq.sh
index c6caa0dc88b..449d9f2058d 100644
--- a/bin/tests/system/enginepkcs11/prereq.sh
+++ b/bin/tests/system/enginepkcs11/prereq.sh
@@ -13,6 +13,11 @@
 
 . ../conf.sh
 
+[ "prereq/var/tmp/etc/openssl-provider.cnf" -eq "prereq${OPENSSL_CONF}" ] || {
+  echo_i "skip: pkcs11-provider not enabled"
+  exit 255
+}
+
 [ -n "${SOFTHSM2_CONF}" ] || {
   echo_i "skip: softhsm2 configuration not available"
   exit 255