TEST: check 'loadereng' to determine if loader_attic should be tested

Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/15858)
This commit is contained in:
Richard Levitte 2021-06-22 11:56:18 +02:00
parent 0d40745671
commit 488689507c
2 changed files with 8 additions and 5 deletions

View File

@ -41,12 +41,15 @@ my @cmp_basic_tests = (
);
my @cmp_server_tests = (
[ "with polling", [ "-poll_count", "1" ], 1 ],
[ "with loader_attic engine", [ "-engine", "loader_attic"],
!disabled('dynamic-engine') &&
!disabled("deprecated-3.0") ]
[ "with polling", [ "-poll_count", "1" ], 1 ]
);
# loader_attic doesn't build on VMS, so we don't test it
push @cmp_server_tests, (
[ "with loader_attic engine", [ "-engine", "loader_attic"], 1 ]
)
unless disabled('loadereng');
plan tests => @cmp_basic_tests + @cmp_server_tests;
foreach (@cmp_basic_tests) {

View File

@ -101,7 +101,7 @@ my @prov_method = qw(-provider default);
push @prov_method, qw(-provider legacy) unless disabled('legacy');
push @methods, [ @prov_method ];
push @methods, [qw(-engine loader_attic)]
unless disabled('dynamic-engine') || disabled('deprecated-3.0');
unless disabled('loadereng');
my $n = scalar @methods
* ( (3 * scalar @noexist_files)