generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Don't announce tests run in empty directories

Browse Source
This commit is contained in:
Dr. Stephen Henson 2010-09-20 23:25:07 +00:00
parent 3926bbcf6d
commit 0061aa9f32
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
fips/mkfipsscr.pl
View File

@ -306,6 +306,7 @@ my $rspdir = "rsp";
my $rspignore = 0; my $rspignore = 0;
my @bogus = (); # list of unmatched *.rsp files my @bogus = (); # list of unmatched *.rsp files
my $bufout = ''; my $bufout = '';
my $bufdir = '';
my %_programs = (); # list of external programs to check my %_programs = (); # list of external programs to check
foreach (@ARGV) foreach (@ARGV)
@ -423,7 +424,6 @@ else
RM="$rmcmd" RM="$rmcmd"
MKDIR="$mkcmd" MKDIR="$mkcmd"
TPREFIX=$tprefix TPREFIX=$tprefix
END END
} }
@ -567,7 +567,7 @@ sub test_dir
{ {
$rsp =~ tr|/|\\|; $rsp =~ tr|/|\\|;
$req =~ tr|/|\\|; $req =~ tr|/|\\|;
$bufout .= <<END; $bufdir = <<END;
echo Running tests in $req echo Running tests in $req
if exist "$rsp" rd /s /q "$rsp" if exist "$rsp" rd /s /q "$rsp"
@ -576,7 +576,7 @@ END
} }
else else
{ {
$bufout .= <<END; $bufdir = <<END;
echo Running tests in "$req" echo Running tests in "$req"
\$RM "$rsp" \$RM "$rsp"
@ -592,6 +592,10 @@ sub test_line
my ($win32, $req, $tprefix, $tnam) = @_; my ($win32, $req, $tprefix, $tnam) = @_;
my $rsp = $req; my $rsp = $req;
my $tcmd = $fips_tests{$tnam}; my $tcmd = $fips_tests{$tnam};
$bufout .= $bufdir;
$bufdir = "";
$rsp =~ s/req\/([^\/]*).req$/$rspdir\/$1.rsp/; $rsp =~ s/req\/([^\/]*).req$/$rspdir\/$1.rsp/;
if ($tcmd =~ /-f$/) if ($tcmd =~ /-f$/)
{ {