[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  502e16853367f373ec2aad94f1fd24884c4a7b65 (commit)
      from  d9e309a675900030d7308e36f614962a344816f9 (commit)


- Log -----------------------------------------------------------------
commit 502e16853367f373ec2aad94f1fd24884c4a7b65
Author: Richard Levitte <levitte at openssl.org>
Date:   Thu Jan 14 01:46:23 2016 +0100

    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 at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 test/testlib/OpenSSL/Test.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/testlib/OpenSSL/Test.pm b/test/testlib/OpenSSL/Test.pm
index 06accb5..6af5e96 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 = "";