Skip the GOST test where appropriate

The GOST ciphers are dynamically loaded via the GOST engine, so we must
be able to support that. The engine also uses DSA and CMS symbols, so we
skip the test on no-dsa or no-cms.

Reviewed-by: Tim Hudson <tjh@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/6730)

diff --git a/test/recipes/90-test_gost.t b/test/recipes/90-test_gost.t
index 00f95af20c0afa23d936ebd271d5c64816447767..c7bbb4edd8d4214b355fa4620234e48d6a5755ec 100644 (file)
--- a/test/recipes/90-test_gost.t
+++ b/test/recipes/90-test_gost.t
@@ -11,8 +11,12 @@ use OpenSSL::Test qw/:DEFAULT srctop_file/;
 
 setup("test_gost");
 
+# The GOST ciphers are dynamically loaded via the GOST engine, so we must be
+# able to support that. The engine also uses DSA and CMS symbols, so we skip
+# this test on no-dsa or no-cms.
 plan skip_all => "GOST support is disabled in this OpenSSL build"
-    if disabled("gost");
+    if disabled("gost") || disabled("engine") || disabled("dynamic-engine")
+       || disabled("dsa") || disabled("cms");
 
 plan skip_all => "TLSv1.3 or TLSv1.2 are disabled in this OpenSSL build"
     if disabled("tls1_3") || disabled("tls1_2");