From 488689507c9a2bc5626411c8e1c597db329183bc Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Tue, 22 Jun 2021 11:56:18 +0200 Subject: [PATCH] TEST: check 'loadereng' to determine if loader_attic should be tested Reviewed-by: Tomas Mraz (Merged from https://github.com/openssl/openssl/pull/15858) --- test/recipes/81-test_cmp_cli.t | 11 +++++++---- test/recipes/90-test_store.t | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/test/recipes/81-test_cmp_cli.t b/test/recipes/81-test_cmp_cli.t index fd1a1b0607..20ce738052 100644 --- a/test/recipes/81-test_cmp_cli.t +++ b/test/recipes/81-test_cmp_cli.t @@ -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) { diff --git a/test/recipes/90-test_store.t b/test/recipes/90-test_store.t index a61ed5b51e..e9a33c91d9 100644 --- a/test/recipes/90-test_store.t +++ b/test/recipes/90-test_store.t @@ -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)