Commit 41a846c6 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Don't use TPREFIX shell variable for minimal script.

parent 3335b6f2

fips/fipsalgtest.pl

+7 −3
Original line number Original line Diff line number Diff line
@@ -938,6 +938,7 @@ sub run_tests { 
    my ( $tname, $tref );

    my ( $tname, $tref );

    my $bad = 0;

    my $bad = 0;

    my $lastdir = "";

    my $lastdir = "";

    $stprefix = $tprefix unless defined $stprefix;

    if ($outfile ne "") {

    if ($outfile ne "") {

	open OUT, ">$outfile" || die "Can't open $outfile";

	open OUT, ">$outfile" || die "Can't open $outfile";

    }

    }
@@ -953,7 +954,6 @@ echo Running Algorithm Tests 




END

END

	} else {

	} else {

	$stprefix = $tprefix unless defined $stprefix;

	    print OUT <<END;

	    print OUT <<END;

#!/bin/sh

#!/bin/sh
@@ -1041,8 +1041,12 @@ END 
        my $cmd = "$tcmd \"$req\" \"$out\"";

        my $cmd = "$tcmd \"$req\" \"$out\"";

        print STDERR "DEBUG: running test $tname\n" if ( $debug && !$verify );

        print STDERR "DEBUG: running test $tname\n" if ( $debug && !$verify );

	if ($outfile ne "") {

	if ($outfile ne "") {

	    if ($minimal_script) {

		print OUT "$stprefix$cmd\n";

	    } else {

		print OUT "echo \"    running $tname test\"\n" unless $minimal_script;

		print OUT "echo \"    running $tname test\"\n" unless $minimal_script;

		print OUT "\${TPREFIX}$cmd\n";

		print OUT "\${TPREFIX}$cmd\n";

	    }

        } else {

        } else {

            $cmd = "$tprefix$cmd";

            $cmd = "$tprefix$cmd";

            system($cmd);

            system($cmd);