From: Richard Levitte <levitte@openssl.org>
Date: Tue, 26 Jan 2016 14:01:00 +0000 (+0100)
Subject: 80-test_ca.t is made to use the new perlapp()
X-Git-Tag: OpenSSL_1_1_0-pre3~411
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=aa50e2a39d9e9ec3226d0b33feaf98198e779d47;p=oweals%2Fopenssl.git

80-test_ca.t is made to use the new perlapp()

Reviewed-by: Matt Caswell <matt@openssl.org>
---

diff --git a/test/recipes/80-test_ca.t b/test/recipes/80-test_ca.t
index b00e303d82..e97a83fbc4 100644
--- a/test/recipes/80-test_ca.t
+++ b/test/recipes/80-test_ca.t
@@ -4,40 +4,35 @@ 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 OpenSSL::Test qw/:DEFAULT cmdstr top_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");
 
-($perl) = quotify($perl) unless $^O eq "VMS"; # never quotify a command on VMS. Ever!
-
 remove_tree("demoCA", { safe => 0 });
 
 plan tests => 4;
  SKIP: {
      $ENV{OPENSSL_CONFIG} = "-config ".top_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, stderr => undef)),
 		'creating CA structure');
 
      $ENV{OPENSSL_CONFIG} = "-config ".top_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"], stderr => undef)),
+		'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"], stderr => undef))), 0,
 		'signing certificate request');
 
-     is(system("$perl ".$CA_pl." -verify newcert.pem 2>&1"), 0,
+     ok(run(perlapp(["CA.pl", "-verify", "newcert.pem"], stderr => undef)),
 	'verifying new certificate');
 }