Have some more test recipes clean up after themselves

Reviewed-by: Rich Salz <rsalz@openssl.org>

3 files changed, 43 insertions, 3 deletions

diff --git a/test/recipes/10-test_bn.t b/test/recipes/10-test_bn.t
index e35498d5a1..13f278e703 100644
--- a/test/recipes/10-test_bn.t
+++ b/test/recipes/10-test_bn.t
@@ -64,7 +64,9 @@ my $init = ok(run(test(["bntest"], stdout => $testresults)), 'initialize');
 	     last unless $l;
 	 }
      };
-}
+ }
+
+unlink $testresults;
 
 sub check_operations {
     my $failcount = 0;
diff --git a/test/recipes/80-test_ca.t b/test/recipes/80-test_ca.t
index cd42687197..f4c01d5fa2 100644
--- a/test/recipes/80-test_ca.t
+++ b/test/recipes/80-test_ca.t
@@ -45,7 +45,7 @@ plan tests => 4;
 
 
 rmtree("demoCA", { safe => 0 });
-unlink "newcert.pem", "newreq.pem";
+unlink "newcert.pem", "newreq.pem", "newkey.pem";
 
 
 sub yes {
diff --git a/test/recipes/80-test_ssl_old.t b/test/recipes/80-test_ssl_old.t
index 74d4360c94..59d48a02a0 100644
--- a/test/recipes/80-test_ssl_old.t
+++ b/test/recipes/80-test_ssl_old.t
@@ -11,7 +11,7 @@ use strict;
 use warnings;
 
 use POSIX;
-use File::Spec;
+use File::Basename;
 use File::Copy;
 use OpenSSL::Test qw/:DEFAULT with bldtop_file srctop_file cmdstr/;
 use OpenSSL::Test::Utils;
@@ -798,3 +798,41 @@ sub testssl {
         }
     };
 }
+
+unlink $CAkey;
+unlink $CAcert;
+unlink $CAserial;
+unlink $CAreq;
+unlink $CAreq2;
+
+unlink $Ukey;
+unlink $Ureq;
+unlink $Ucert;
+unlink basename($Ucert, '.ss').'.srl';
+
+unlink $Dkey;
+unlink $Dreq;
+unlink $Dcert;
+
+unlink $Ekey;
+unlink $Ereq;
+unlink $Ecert;
+
+unlink $P1key;
+unlink $P1req;
+unlink $P1cert;
+unlink basename($P1cert, '.ss').'.srl';
+unlink $P1intermediate;
+unlink "intP1.ss";
+
+unlink $P2key;
+unlink $P2req;
+unlink $P2cert;
+unlink $P2intermediate;
+unlink "intP2.ss";
+
+unlink "ecp.ss";
+unlink "err.ss";
+
+unlink $server_sess;
+unlink $client_sess;