From: Richard Levitte <levitte@openssl.org>
Date: Sat, 30 Jan 2016 16:11:48 +0000 (+0100)
Subject: When checking if there's a VMS directory spec, don't forget the possible device
X-Git-Tag: OpenSSL_1_1_0-pre3~354
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=c10d1bc81cb047cbd53f8cc430632b6a4a70252d;p=oweals%2Fopenssl.git

When checking if there's a VMS directory spec, don't forget the possible device

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

diff --git a/test/testlib/OpenSSL/Test.pm b/test/testlib/OpenSSL/Test.pm
index e1c2899c7e..297de8642f 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 = "";