Raise an error on syscall failure in tls_retry_write_records

[thirdparty/openssl.git] / test / recipes / 30-test_evp_libctx.t

diff --git a/test/recipes/30-test_evp_libctx.t b/test/recipes/30-test_evp_libctx.t
index 2ba20057e39b578a380d0ef0815fa6ea7fcadacd..0086cf22c961f6ac2f52562d418d74573c52a827 100644 (file)
--- a/test/recipes/30-test_evp_libctx.t
+++ b/test/recipes/30-test_evp_libctx.t
@@ -1,5 +1,5 @@
 #! /usr/bin/env perl
-# Copyright 2020 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2020-2021 The OpenSSL Project Authors. All Rights Reserved.
 #
 # Licensed under the Apache License 2.0 (the "License").  You may not use
 # this file except in compliance with the License.  You can obtain a copy
@@ -16,31 +16,31 @@ 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');
 use lib bldtop_dir('.');
-use platform;
 
-my $infile = bldtop_file('providers', platform->dso('fips'));
 # If no fips then run the test with no extra arguments.
 my @test_args = ( );
 
-plan tests =>
-    ($no_fips ? 0 : 2)          # 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"),
                   "-provider", "fips");
 
-    ok(run(app(['openssl', 'fipsinstall',
-               '-out', bldtop_file('providers', 'fipsmodule.cnf'),
-               '-module', $infile])),
-       "fipsinstall");
     ok(run(test(["evp_libctx_test", @test_args])), "running fips evp_libctx_test");
 }
 
 ok(run(test(["evp_libctx_test",
-             "-config", srctop_file("test","default-and-legacy.cnf"),])),
-   "running default-and-legacy evp_libctx_test");
+             "-config", srctop_file("test","default.cnf"),])),
+   "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");
+}
+