Don't use TPREFIX shell variable for minimal script.

[oweals/openssl.git] / fips / fipsalgtest.pl

diff --git a/fips/fipsalgtest.pl b/fips/fipsalgtest.pl
index 9f62d2c60643da55eb1b312be0e5c3e3c00ecb7a..2f6c45f9edfe1aaab75a560a93a649eb4827642d 100644 (file)
--- a/fips/fipsalgtest.pl
+++ b/fips/fipsalgtest.pl
@@ -756,6 +756,10 @@ $cmd: generate run CAVP algorithm tests
        --ignore-missing            Ignore missing test files
        --quiet                     Shhh....
        --generate                  Generate algorithm test output
+       --generate-script=<file>    Create shell script of test commands
+       --minimal-script            Keep script commands to a minimum
+       --mkdir=<command>           Command to make directories in scripts
+       --rm=<command>              Command to remove directories in scripts
        --win32                     Win32 environment
        --enable-<alg>              Enable algorithm set <alg>.
        --disable-<alg>             Disable algorithm set <alg>.
@@ -934,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";
     }
@@ -949,7 +954,6 @@ echo Running Algorithm Tests
 
 END
        } else {
-       $stprefix = $tprefix unless defined $stprefix;
            print OUT <<END;
 #!/bin/sh
 
@@ -1037,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);