From 5e26c3399d154b9ed29558129ca1916a1b5b095e Mon Sep 17 00:00:00 2001
From: "Dr. David von Oheimb" <David.von.Oheimb@siemens.com>
Date: Mon, 28 Sep 2020 10:57:00 +0200
Subject: [PATCH] 30-test_evp.t: On no-dh, no-dsa, no-ec, no-sm2, and no-gost
 configurations disable respective tests

Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/13022)
---
 test/recipes/30-test_evp.t | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/test/recipes/30-test_evp.t b/test/recipes/30-test_evp.t
index 4d9e9fd372..17e2d17007 100644
--- a/test/recipes/30-test_evp.t
+++ b/test/recipes/30-test_evp.t
@@ -23,6 +23,11 @@ use platform;
 
 my $no_fips = disabled('fips') || ($ENV{NO_FIPS} // 0);
 my $no_legacy = disabled('legacy') || ($ENV{NO_LEGACY} // 0);
+my $no_dh = disabled("dh");
+my $no_dsa = disabled("dsa");
+my $no_ec = disabled("ec");
+my $no_gost = disabled("gost");
+my $no_sm2 = disabled("sm2");
 
 # Default config depends on if the legacy module is built or not
 my $defaultcnf = $no_legacy ? 'default.cnf' : 'default-and-legacy.cnf';
@@ -46,18 +51,20 @@ my @files = qw(
                 evpmac_common.txt
                 evpmd_sha.txt
                 evppbe_pbkdf2.txt
-                evppkey_dsa.txt 
+                evppkey_kdf_hkdf.txt
+                evppkey_rsa_common.txt
+                evprand.txt
+              );
+push @files, qw(evppkey_ffdhe.txt) unless $no_dh;
+push @files, qw(evppkey_dsa.txt) unless $no_dsa;
+push @files, qw(evppkey_ecx.txt) unless $no_ec;
+push @files, qw(
                 evppkey_ecc.txt
                 evppkey_ecdh.txt
                 evppkey_ecdsa.txt
-                evppkey_ecx.txt
-                evppkey_ffdhe.txt
                 evppkey_kas.txt
-                evppkey_kdf_hkdf.txt
                 evppkey_mismatch.txt
-                evppkey_rsa_common.txt
-                evprand.txt
-              );
+              ) unless $no_ec || $no_gost;
 
 # A list of tests that only run with the default provider
 # (i.e. The algorithms are not present in the fips provider)
@@ -93,12 +100,12 @@ my @defltfiles = qw(
                      evpmd_whirlpool.txt
                      evppbe_scrypt.txt
                      evppbe_pkcs12.txt
-                     evppkey_brainpool.txt
                      evppkey_kdf_scrypt.txt
                      evppkey_kdf_tls1_prf.txt
                      evppkey_rsa.txt
-                     evppkey_sm2.txt
                     );
+push @defltfiles, qw(evppkey_brainpool.txt) unless $no_ec;
+push @defltfiles, qw(evppkey_sm2.txt) unless $no_sm2;
 
 plan tests =>
     ($no_fips ? 0 : 1)          # FIPS install test
-- 
GitLab