From: Dr. Stephen Henson <steve@openssl.org>
Date: Fri, 14 Oct 2011 15:15:20 +0000 (+0000)
Subject: Don't use TPREFIX shell variable for minimal script.
X-Git-Tag: OpenSSL-fips-2_0-rc1~59
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=41a846c694f93b073798bc7dd78a3cb465a27485;p=oweals%2Fopenssl.git

Don't use TPREFIX shell variable for minimal script.
---

diff --git a/fips/fipsalgtest.pl b/fips/fipsalgtest.pl
index 28dd315109..2f6c45f9ed 100644
--- a/fips/fipsalgtest.pl
+++ b/fips/fipsalgtest.pl
@@ -938,6 +938,7 @@ sub run_tests {
     my ( $tname, $tref );
     my $bad = 0;
     my $lastdir = "";
+    $stprefix = $tprefix unless defined $stprefix;
     if ($outfile ne "") {
 	open OUT, ">$outfile" || die "Can't open $outfile";
     }
@@ -953,7 +954,6 @@ echo Running Algorithm Tests
 
 END
 	} else {
-	$stprefix = $tprefix unless defined $stprefix;
 	    print OUT <<END;
 #!/bin/sh
 
@@ -1041,8 +1041,12 @@ END
         my $cmd = "$tcmd \"$req\" \"$out\"";
         print STDERR "DEBUG: running test $tname\n" if ( $debug && !$verify );
 	if ($outfile ne "") {
-	    print OUT "echo \"    running $tname test\"\n" unless $minimal_script;
-	    print OUT "\${TPREFIX}$cmd\n";
+	    if ($minimal_script) {
+		print OUT "$stprefix$cmd\n";
+	    } else {
+		print OUT "echo \"    running $tname test\"\n" unless $minimal_script;
+		print OUT "\${TPREFIX}$cmd\n";
+	    }
         } else {
             $cmd = "$tprefix$cmd";
             system($cmd);