Adapt some test recipes to the newer cmdstr()

[openssl.git] / test / recipes / 80-test_ca.t

diff --git a/test/recipes/80-test_ca.t b/test/recipes/80-test_ca.t
index b00e303d8254347d836609fe984e86605ce321c1..09d5ba6dc399d78ddaf9c5d68d8745559a4ac55a 100644 (file)
--- a/test/recipes/80-test_ca.t
+++ b/test/recipes/80-test_ca.t
@@ -4,45 +4,40 @@ use strict;
 use warnings;
 
 use POSIX;
-use File::Spec::Functions qw/splitdir curdir catfile devnull/;
-use File::Path 2.00 qw/remove_tree/;
-use OpenSSL::Test qw/:DEFAULT cmdstr top_file quotify/;
+use File::Path 2.00 qw/rmtree/;
+use OpenSSL::Test qw/:DEFAULT cmdstr srctop_file/;
 
 setup("test_ca");
 
-my $perl = $^X;
-$ENV{OPENSSL} = cmdstr(app(["openssl"]));
-my $CA_pl = top_file("apps", "CA.pl");
-my $std_openssl_cnf = $^O eq "VMS"
-    ? top_file("apps", "openssl-vms.cnf") : top_file("apps", "openssl.cnf");
+$ENV{OPENSSL} = cmdstr(app(["openssl"]), display => 1);
+my $std_openssl_cnf =
+    srctop_file("apps", $^O eq "VMS" ? "openssl-vms.cnf" : "openssl.cnf");
 
-($perl) = quotify($perl) unless $^O eq "VMS"; # never quotify a command on VMS. Ever!
-
-remove_tree("demoCA", { safe => 0 });
+rmtree("demoCA", { safe => 0 });
 
 plan tests => 4;
  SKIP: {
-     $ENV{OPENSSL_CONFIG} = "-config ".top_file("test", "CAss.cnf");
+     $ENV{OPENSSL_CONFIG} = "-config ".srctop_file("test", "CAss.cnf");
      skip "failed creating CA structure", 3
-        if !is(system("$perl ".$CA_pl." -newca < ".devnull()." 2>&1"), 0,
+        if !ok(run(perlapp(["CA.pl","-newca"], stdin => undef)),
                'creating CA structure');
 
-     $ENV{OPENSSL_CONFIG} = "-config ".top_file("test", "Uss.cnf");
+     $ENV{OPENSSL_CONFIG} = "-config ".srctop_file("test", "Uss.cnf");
      skip "failed creating new certificate request", 2
-        if !is(system("$perl ".$CA_pl." -newreq 2>&1"), 0,
-               'creating new certificate request');
+        if !ok(run(perlapp(["CA.pl","-newreq"])),
+               'creating CA structure');
 
      $ENV{OPENSSL_CONFIG} = "-config ".$std_openssl_cnf;
      skip "failed to sign certificate request", 1
-        if !is(yes("$perl ".$CA_pl." -sign 2>&1"), 0,
+        if !is(yes(cmdstr(perlapp(["CA.pl", "-sign"]))), 0,
                'signing certificate request');
 
-     is(system("$perl ".$CA_pl." -verify newcert.pem 2>&1"), 0,
+     ok(run(perlapp(["CA.pl", "-verify", "newcert.pem"])),
        'verifying new certificate');
 }
 
 
-remove_tree("demoCA", { safe => 0 });
+rmtree("demoCA", { safe => 0 });
 unlink "newcert.pem", "newreq.pem";
 
 
@@ -54,3 +49,4 @@ sub yes {
     close PIPE;
     return 0;
 }
+