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)

diff --git a/test/recipes/81-test_cmp_cli.t b/test/recipes/81-test_cmp_cli.t
index fd1a1b06076084238a24b500998a1aac5e7140ec..20ce7380529b9e86b3350b2a43fffd1b2d030318 100644 (file)
--- 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 a61ed5b51e694fdc1a43663390a99b59b5f1105e..e9a33c91d98dc87e202cc2488dc7d1425200a6cc 100644 (file)
--- 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)