From: Ondrej Moris Date: Wed, 16 Apr 2025 16:03:35 +0000 (+0200) Subject: test: reduce the scope of pkcs11-provider external test X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=edd3f47fd76e50b96685b95bb9a63e6e23e51348;p=thirdparty%2Fopenssl.git test: reduce the scope of pkcs11-provider external test To ease maintenance and improve reliability of pkcs11-provider external test we only want it to run with kryoptic token. Signed-off-by: Ondrej Moris Reviewed-by: Dmitry Belyavskiy Reviewed-by: Tomas Mraz (Merged from https://github.com/openssl/openssl/pull/27602) --- diff --git a/test/README-external.md b/test/README-external.md index d094c66f825..a98c6976c89 100644 --- a/test/README-external.md +++ b/test/README-external.md @@ -132,8 +132,7 @@ Then configure/build OpenSSL enabling external tests: $ make pkcs11-provider requires meson for the build process. Moreover, it requires -softhsm and nss softokn tokens and certtool, certutil, pkcs11-tool and expect -to run the tests. +kryoptic, opensc and expect to run the tests. Tests will then be run as part of the rest of the suite, or can be explicitly run (with more debugging): diff --git a/test/recipes/95-test_external_pkcs11_provider_data/pkcs11-provider.sh b/test/recipes/95-test_external_pkcs11_provider_data/pkcs11-provider.sh index de09b46a0f5..88d34402800 100755 --- a/test/recipes/95-test_external_pkcs11_provider_data/pkcs11-provider.sh +++ b/test/recipes/95-test_external_pkcs11_provider_data/pkcs11-provider.sh @@ -64,7 +64,8 @@ echo "Running tests" echo "------------------------------------------------------------------" # The OpenSSL app uses ${HARNESS_OSSL_PREFIX} as a prefix for its standard output -HARNESS_OSSL_PREFIX= meson test -C $PKCS11_PROVIDER_BUILDDIR +# For maintenance reasons and simplicity we only run test with kryoptic token +HARNESS_OSSL_PREFIX= meson test -C $PKCS11_PROVIDER_BUILDDIR --suite=kryoptic if [ $? -ne 0 ]; then cat $PKCS11_PROVIDER_BUILDDIR/meson-logs/testlog.txt