From: Richard Levitte <levitte@openssl.org>
Date: Thu, 14 Jan 2016 00:46:23 +0000 (+0100)
Subject: Add a directry spec for mcr if there is none
X-Git-Tag: OpenSSL_1_1_0-pre2~9
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=502e16853367f373ec2aad94f1fd24884c4a7b65;p=oweals%2Fopenssl.git

Add a directry spec for mcr if there is none

On VMS, the command MCR will assume SYS$SYSTEM: when the first
argument lacks a directory spec.  So for programs in the current
directory, we add [] to tell MCR it is in the current directory.
It's the same as having ./ at the start of a program on Unix so the
shell doesn't start looking along $PATH.

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

diff --git a/test/testlib/OpenSSL/Test.pm b/test/testlib/OpenSSL/Test.pm
index 06accb5a52..6af5e963fc 100644
--- a/test/testlib/OpenSSL/Test.pm
+++ b/test/testlib/OpenSSL/Test.pm
@@ -675,7 +675,7 @@ sub __fixup_cmd {
     if (defined($ENV{EXE_SHELL})) {
 	$prefix = "$ENV{EXE_SHELL} ";
     } elsif ($^O eq "VMS" ) {	# VMS
-	$prefix = "mcr ";
+	$prefix = ($prog =~ /^[<\[]/ ? "mcr " : "mcr []");
 	$ext = ".exe";
     } elsif ($^O eq "MSWin32") { # Windows
 	$prefix = "";