TEST: Cleanup test recipes

Name mixups cleared, and a few more test case result files that
arent't removed, making forensics on failed tests easier.

Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14505)

test/recipes/02-test_internal_keymgmt.t

@@ -11,7 +11,7 @@ use OpenSSL::Test qw(:DEFAULT bldtop_dir);
 use OpenSSL::Test::Simple;
 use OpenSSL::Test::Utils;
 
-setup("test_internal_provider");
+setup("test_internal_keymgmt");
 
 $ENV{OPENSSL_MODULES} = bldtop_dir("test");
 

test/recipes/20-test_mac.t

@@ -190,10 +190,9 @@ sub comparefile {
     my $buffer;
     my $BUFSIZE = 1024;
     read($out, $buffer, $BUFSIZE) or die "unable to read";
-    # Not unlinking $outfile
-
     my $line = uc unpack("H*", $buffer);
     close($out);
+    # Not unlinking $outfile
 
     if ($line eq $expect) {
         return 1;

test/recipes/25-test_eai_data.t

@@ -32,16 +32,21 @@ my $utf8_pem  = srctop_file($folder, "utf8_leaf.pem");
 my $ascii_chain_pem = srctop_file($folder, "ascii_chain.pem");
 my $utf8_chain_pem  = srctop_file($folder, "utf8_chain.pem");
 
-my $out = "san.tmp";
+my $out;
+my $outcnt = 0;
+sub outname {
+    $outcnt++;
+    return "sanout-$outcnt.tmp";
+}
 
+$out = outname();
 ok(run(app(["openssl", "x509", "-ext", "subjectAltName", "-in", $ascii_pem, "-noout", "-out", $out])));
 is(cmp_text($out, srctop_file($folder, "san.ascii")), 0, 'Comparing othername for ASCII domain');
 
+$out = outname();
 ok(run(app(["openssl", "x509", "-ext", "subjectAltName", "-in", $utf8_pem, "-noout", "-out", $out])));
 is(cmp_text($out, srctop_file($folder, "san.utf8")), 0, 'Comparing othername for IDN domain');
 
-unlink $out;
-
 ok(run(app(["openssl", "verify", "-nameopt", "utf8", "-no_check_time", "-verify_email", "学生\@elementary.school.example.com", "-CAfile", $ascii_chain_pem, $ascii_pem])));
 ok(run(app(["openssl", "verify", "-nameopt", "utf8", "-no_check_time", "-verify_email", "医生\@大学.example.com", "-CAfile", $utf8_chain_pem, $utf8_pem])));
 

test/recipes/65-test_cmp_hdr.t

@@ -12,7 +12,7 @@ use strict;
 use OpenSSL::Test qw/:DEFAULT data_file/;
 use OpenSSL::Test::Utils;
 
-setup("test_cmp_lib");
+setup("test_cmp_hdr");
 
 plan skip_all => "This test is not supported in a no-cmp build"
     if disabled("cmp");

test/recipes/65-test_cmp_status.t

@@ -12,7 +12,7 @@ use strict;
 use OpenSSL::Test qw/:DEFAULT data_file/;
 use OpenSSL::Test::Utils;
 
-setup("test_cmp_lib");
+setup("test_cmp_status");
 
 plan skip_all => "This test is not supported in a no-cmp build"
     if disabled("cmp");

test/recipes/70-test_sslvertol.t

@@ -11,7 +11,7 @@ use OpenSSL::Test qw/:DEFAULT cmdstr srctop_file bldtop_dir/;
 use OpenSSL::Test::Utils;
 use TLSProxy::Proxy;
 
-my $test_name = "test_sslextension";
+my $test_name = "test_sslvertol";
 setup($test_name);
 
 plan skip_all => "TLSProxy isn't usable on $^O"

test/recipes/71-test_ssl_ctx.t

@@ -10,7 +10,7 @@ use strict;
 use warnings;
 use OpenSSL::Test;
 
-setup("ssl_ctx_test");
+setup("test_ssl_ctx");
 
 plan tests => 1;
 ok(run(test(["ssl_ctx_test"])));

test/recipes/90-test_tls13encryption.t

@@ -9,7 +9,7 @@
 use OpenSSL::Test;
 use OpenSSL::Test::Utils;
 
-my $test_name = "tls13encryption";
+my $test_name = "test_tls13encryption";
 setup($test_name);
 
 plan skip_all => "$test_name is not supported in this build"

test/recipes/90-test_tls13secrets.t

@@ -9,7 +9,7 @@
 use OpenSSL::Test;
 use OpenSSL::Test::Utils;
 
-my $test_name = "tls13secrets";
+my $test_name = "test_tls13secrets";
 setup($test_name);
 
 plan skip_all => "$test_name is not supported in this build"

test/recipes/95-test_external_gost_engine.t

@@ -11,7 +11,7 @@ use OpenSSL::Test;
 use OpenSSL::Test::Utils;
 use OpenSSL::Test qw/:DEFAULT bldtop_file data_file srctop_file cmdstr/;
 
-setup("test_external");
+setup("test_external_gost_engine");
 
 plan skip_all => "No external tests in this configuration"
     if disabled("external-tests");

test/recipes/95-test_external_pyca.t

@@ -11,7 +11,7 @@ use OpenSSL::Test;
 use OpenSSL::Test::Utils;
 use OpenSSL::Test qw/:DEFAULT bldtop_file data_file srctop_file cmdstr/;
 
-setup("test_external");
+setup("test_external_pyca");
 
 plan skip_all => "No external tests in this configuration"
     if disabled("external-tests");