From: Jon Spillett <jon.spillett@oracle.com>
Date: Fri, 14 May 2021 01:15:25 +0000 (+1000)
Subject: Add an evp_libctx_test test run for legacy provider
X-Git-Tag: openssl-3.0.0-beta1~385
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2710ddef6fdee65f0fc89c1e8698736f9317ed14;p=thirdparty%2Fopenssl.git

Add an evp_libctx_test test run for legacy provider

Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Paul Dale <pauli@openssl.org>
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/15276)
---

diff --git a/test/recipes/30-test_evp_libctx.t b/test/recipes/30-test_evp_libctx.t
index 81abbdb3bf2..0086cf22c96 100644
--- a/test/recipes/30-test_evp_libctx.t
+++ b/test/recipes/30-test_evp_libctx.t
@@ -16,6 +16,7 @@ BEGIN {
     setup("test_evp_libctx");
 }
 
+my $no_legacy = disabled('legacy') || ($ENV{NO_LEGACY} // 0);
 my $no_fips = disabled('fips') || ($ENV{NO_FIPS} // 0);
 
 use lib srctop_dir('Configurations');
@@ -24,9 +25,7 @@ use lib bldtop_dir('.');
 # If no fips then run the test with no extra arguments.
 my @test_args = ( );
 
-plan tests =>
-    ($no_fips ? 0 : 1)          # FIPS install test
-    + 1;
+plan tests => ($no_fips ? 0 : 1) + ($no_legacy ? 0 : 1) + 1;
 
 unless ($no_fips) {
     @test_args = ("-config", srctop_file("test","fips-and-base.cnf"),
@@ -37,4 +36,11 @@ unless ($no_fips) {
 
 ok(run(test(["evp_libctx_test",
              "-config", srctop_file("test","default.cnf"),])),
-   "running default-and-legacy evp_libctx_test");
+   "running default evp_libctx_test");
+
+unless ($no_legacy) {
+    ok(run(test(["evp_libctx_test",
+                 "-config", srctop_file("test","default-and-legacy.cnf"),])),
+       "running default-and-legacy evp_libctx_test");
+}
+