From: Richard Levitte <levitte@openssl.org>
Date: Thu, 31 Mar 2016 13:08:34 +0000 (+0200)
Subject: OpenSSL::Test: have cmdstr() return the true command.
X-Git-Tag: OpenSSL_1_1_0-pre5~179
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=349232d149804dae09987af7612000e30ee7c4cc;p=oweals%2Fopenssl.git

OpenSSL::Test: have cmdstr() return the true command.

On the other hand, have run() display the display variant.

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

diff --git a/test/testlib/OpenSSL/Test.pm b/test/testlib/OpenSSL/Test.pm
index 53a15c4fa5..b0a609fd4d 100644
--- a/test/testlib/OpenSSL/Test.pm
+++ b/test/testlib/OpenSSL/Test.pm
@@ -354,7 +354,7 @@ sub run {
 	$r = $hooks{exit_checker}->($e);
     }
 
-    print STDERR "$prefix$cmd => $e\n"
+    print STDERR "$prefix$display_cmd => $e\n"
         if !$ENV{HARNESS_ACTIVE} || $ENV{HARNESS_VERBOSE};
 
     # At this point, $? stops being interesting, and unfortunately,
@@ -560,7 +560,7 @@ command as a string.
 sub cmdstr {
     my ($cmd, $display_cmd) = shift->(0);
 
-    return $display_cmd;
+    return $cmd;
 }
 
 =over 4