[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  c10d1bc81cb047cbd53f8cc430632b6a4a70252d (commit)
      from  9c626317a60f8be8b61df25854f42ad9d73ad205 (commit)


- Log -----------------------------------------------------------------
commit c10d1bc81cb047cbd53f8cc430632b6a4a70252d
Author: Richard Levitte <levitte at openssl.org>
Date:   Sat Jan 30 17:11:48 2016 +0100

    When checking if there's a VMS directory spec, don't forget the possible device
    
    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 e1c2899..297de86 100644
--- a/test/testlib/OpenSSL/Test.pm
+++ b/test/testlib/OpenSSL/Test.pm
@@ -713,7 +713,7 @@ sub __fixup_cmd {
     if (defined($exe_shell)) {
 	$prefix = "$exe_shell ";
     } elsif ($^O eq "VMS" ) {	# VMS
-	$prefix = ($prog =~ /^[<\[]/ ? "mcr " : "mcr []");
+	$prefix = ($prog =~ /^(?:[\$a-z0-9_]+:)?[<\[]/i ? "mcr " : "mcr []");
 	$ext = ".exe";
     } elsif ($^O eq "MSWin32") { # Windows
 	$prefix = "";