summaryrefslogtreecommitdiff
path: root/test/recipes/25-test_x509.t
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2020-02-13 00:28:47 +0100
committerRichard Levitte <levitte@openssl.org>2020-02-18 09:45:52 +0100
commit42f7a4897f80d633646f955599037546bfcba519 (patch)
tree99d83c6c943e3608c09f652234a93a2cdeecb614 /test/recipes/25-test_x509.t
parent11920665518bb5fc0487cf1de82fd89e779f5729 (diff)
downloadopenssl-new-42f7a4897f80d633646f955599037546bfcba519.tar.gz
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)
Diffstat (limited to 'test/recipes/25-test_x509.t')
-rw-r--r--test/recipes/25-test_x509.t14
1 files changed, 6 insertions, 8 deletions
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 {