From: Richard Levitte <levitte@openssl.org>
Date: Wed, 12 Feb 2020 23:28:47 +0000 (+0100)
Subject: TEST: Modify test/recipes/25-test_x509.t to leave artifacts behind
X-Git-Tag: openssl-3.0.0-alpha1~440
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=42f7a4897f80d633646f955599037546bfcba519;p=oweals%2Fopenssl.git

TEST: Modify test/recipes/25-test_x509.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/25-test_x509.t b/test/recipes/25-test_x509.t
index 4780247ea0..7ecdc02742 100644
--- a/test/recipes/25-test_x509.t
+++ b/test/recipes/25-test_x509.t
@@ -21,19 +21,19 @@ plan tests => 10;
 require_ok(srctop_file('test','recipes','tconversion.pl'));
 
 my $pem = srctop_file("test/certs", "cyrillic.pem");
-my $out = "cyrillic.out";
+my $out_msb = "out-cyrillic.msb";
+my $out_utf8 = "out-cyrillic.utf8";
 my $msb = srctop_file("test/certs", "cyrillic.msb");
 my $utf = srctop_file("test/certs", "cyrillic.utf8");
 
-ok(run(app(["openssl", "x509", "-text", "-in", $pem, "-out", $out,
+ok(run(app(["openssl", "x509", "-text", "-in", $pem, "-out", $out_msb,
             "-nameopt", "esc_msb"])));
-is(cmp_text($out, srctop_file("test/certs", "cyrillic.msb")),
+is(cmp_text($out_msb, srctop_file("test/certs", "cyrillic.msb")),
    0, 'Comparing esc_msb output');
-ok(run(app(["openssl", "x509", "-text", "-in", $pem, "-out", $out,
+ok(run(app(["openssl", "x509", "-text", "-in", $pem, "-out", $out_utf8,
             "-nameopt", "utf8"])));
-is(cmp_text($out, srctop_file("test/certs", "cyrillic.utf8")),
+is(cmp_text($out_utf8, srctop_file("test/certs", "cyrillic.utf8")),
    0, 'Comparing utf8 output');
-unlink $out;
 
 SKIP: {
     skip "EC disabled", 1 if disabled("ec");
@@ -54,8 +54,6 @@ SKIP: {
        &&
        run(app(["openssl", "verify", "-no_check_time",
                 "-trusted", $selfout, $testcert])));
-    unlink $pubkey;
-    unlink $selfout;
 }
 
 subtest 'x509 -- x.509 v1 certificate' => sub {