TEST: Modify test/recipes/80-test_ocsp.t to leave artifacts behind

Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/11080)

diff --git a/test/recipes/80-test_ocsp.t b/test/recipes/80-test_ocsp.t
index 5ca069801bcf83cbb7135491953c223c005e1328..74ef7e3662454159d0295667c240ad14205c24ca 100644 (file)
--- a/test/recipes/80-test_ocsp.t
+++ b/test/recipes/80-test_ocsp.t
@@ -12,6 +12,7 @@ use warnings;
 
 use POSIX;
 use File::Spec::Functions qw/devnull catfile/;
 
 use POSIX;
 use File::Spec::Functions qw/devnull catfile/;

+use File::Basename;

 use File::Copy;
 use OpenSSL::Test qw/:DEFAULT with pipe srctop_dir data_file/;
 use OpenSSL::Test::Utils;
 use File::Copy;
 use OpenSSL::Test qw/:DEFAULT with pipe srctop_dir data_file/;
 use OpenSSL::Test::Utils;


@@ -34,18 +35,18 @@ sub test_ocsp {
         $untrusted = $CAfile;
     }
     my $expected_exit = shift;
         $untrusted = $CAfile;
     }
     my $expected_exit = shift;

+    my $outputfile = basename($inputfile, '.ors') . '.dat';

 
     run(app(["openssl", "base64", "-d",
              "-in", catfile($ocspdir,$inputfile),
 
     run(app(["openssl", "base64", "-d",
              "-in", catfile($ocspdir,$inputfile),

-             "-out", "ocsp-resp-fff.dat"]));
+             "-out", $outputfile]));

     with({ exit_checker => sub { return shift == $expected_exit; } },
     with({ exit_checker => sub { return shift == $expected_exit; } },

-         sub { ok(run(app(["openssl", "ocsp", "-respin", "ocsp-resp-fff.dat",
+         sub { ok(run(app(["openssl", "ocsp", "-respin", $outputfile,

                            "-partial_chain", @check_time,
                            "-CAfile", catfile($ocspdir, $CAfile),
                            "-verify_other", catfile($ocspdir, $untrusted),
                            "-no-CApath"])),
                   $title); });
                            "-partial_chain", @check_time,
                            "-CAfile", catfile($ocspdir, $CAfile),
                            "-verify_other", catfile($ocspdir, $untrusted),
                            "-no-CApath"])),
                   $title); });

-    unlink "ocsp-resp-fff.dat";

 }
 
 plan tests => 11;
 }
 
 plan tests => 11;