From: Richard Levitte <levitte@openssl.org>
Date: Wed, 13 Jan 2016 14:16:41 +0000 (+0100)
Subject: Fix test/recipes/80-test_ca.t to work on VMS
X-Git-Tag: OpenSSL_1_1_0-pre2~30
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=4034c38b25b44773660f7427acfcdbbb56f47907;p=oweals%2Fopenssl.git

Fix test/recipes/80-test_ca.t to work on VMS

VMS uses a variant of openssl.cnf named openssl-vms.cnf.

There's a Perl on VMS mystery where a open pipe will not SIGPIPE when
the child process exits, which means that a loop sending "y\n" to it
will never stop.  Adding a counter helps fix this (set to 10, we know
that none of the CA.pl commands will require more).

Reviewed-by: Rich Salz <rsalz@openssl.org>
---

diff --git a/test/recipes/80-test_ca.t b/test/recipes/80-test_ca.t
index ff6eb65711..b00e303d82 100644
--- a/test/recipes/80-test_ca.t
+++ b/test/recipes/80-test_ca.t
@@ -13,7 +13,8 @@ setup("test_ca");
 my $perl = $^X;
 $ENV{OPENSSL} = cmdstr(app(["openssl"]));
 my $CA_pl = top_file("apps", "CA.pl");
-my $std_openssl_cnf = top_file("apps", "openssl.cnf");
+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!
 
@@ -46,9 +47,10 @@ unlink "newcert.pem", "newreq.pem";
 
 
 sub yes {
+    my $cntr = 10;
     open(PIPE, "|-", join(" ",@_));
     local $SIG{PIPE} = "IGNORE";
-    1 while print PIPE "y\n";
+    1 while $cntr-- > 0 && print PIPE "y\n";
     close PIPE;
     return 0;
 }