From: Richard Levitte <levitte@openssl.org>
Date: Tue, 18 Oct 2016 18:55:07 +0000 (+0200)
Subject: OpenSSL::Test - small fixup
X-Git-Tag: OpenSSL_1_1_1-pre1~3350
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=e972273194303e15f8dd7ce69dbcfa27cc024e9f;p=oweals%2Fopenssl.git

OpenSSL::Test - small fixup

Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1686)
---

diff --git a/test/testlib/OpenSSL/Test.pm b/test/testlib/OpenSSL/Test.pm
index ffd287fbb6..4af3629c86 100644
--- a/test/testlib/OpenSSL/Test.pm
+++ b/test/testlib/OpenSSL/Test.pm
@@ -1016,14 +1016,9 @@ sub __fixup_prg {
 	$prefix = ($prog =~ /^(?:[\$a-z0-9_]+:)?[<\[]/i ? "mcr " : "mcr []");
     }
 
-    # We test both with and without extension.  The reason
-    # is that we might be passed a complete file spec, with
-    # extension.
+    # We test if the program to use exists.
     if ( ! -x $prog ) {
-	my $prog = "$prog";
-	if ( ! -x $prog ) {
-	    $prog = undef;
-	}
+	$prog = undef;
     }
 
     if (defined($prog)) {