mirror of
https://github.com/moparisthebest/curl
synced 2024-12-21 23:58:49 -05:00
display interesting log files on failure, if -p is used
This commit is contained in:
parent
c3dd928e29
commit
bf6e1053cf
@ -1543,17 +1543,32 @@ sub displaylogcontent {
|
|||||||
}
|
}
|
||||||
|
|
||||||
sub displaylogs {
|
sub displaylogs {
|
||||||
|
my ($testnum)=@_;
|
||||||
opendir(DIR, "$LOGDIR") ||
|
opendir(DIR, "$LOGDIR") ||
|
||||||
die "can't open dir: $!";
|
die "can't open dir: $!";
|
||||||
my @logs = readdir(DIR);
|
my @logs = readdir(DIR);
|
||||||
closedir DIR;
|
closedir DIR;
|
||||||
my $log;
|
my $log;
|
||||||
|
|
||||||
|
my %interest=('curl.log' => 1,
|
||||||
|
'server.input' => 1,
|
||||||
|
'server.response' => 1,
|
||||||
|
'sws.log' => 1,
|
||||||
|
'ftpd.log' => 1,
|
||||||
|
);
|
||||||
|
|
||||||
print "== Contents of files in the log/ dir:\n";
|
print "== Contents of files in the log/ dir:\n";
|
||||||
foreach $log (sort @logs) {
|
foreach $log (sort @logs) {
|
||||||
# ignore . and .. and the file has nonzero size
|
my $num = $log;
|
||||||
if(($log !~ /^\.(\.|)$/) && (-s "$LOGDIR/$log")) {
|
$num =~ s/[^0-9]//g; # cut off all non-digits
|
||||||
|
|
||||||
|
# the log file is:
|
||||||
|
# generally interesting OR
|
||||||
|
# contains our test case number AND
|
||||||
|
# contains more than zero bytes
|
||||||
|
if(($interest{$log} || ($num == $testnum)) && (-s "$LOGDIR/$log")) {
|
||||||
print "== Start of file $log\n";
|
print "== Start of file $log\n";
|
||||||
#displaylogcontent("$LOGDIR/$log");
|
displaylogcontent("$LOGDIR/$log");
|
||||||
print "== End of file $log\n";
|
print "== End of file $log\n";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -1585,7 +1600,7 @@ foreach $testnum (split(" ", $TESTCASES)) {
|
|||||||
$failed.= "$testnum ";
|
$failed.= "$testnum ";
|
||||||
if($postmortem) {
|
if($postmortem) {
|
||||||
# display all files in log/ in a nice way
|
# display all files in log/ in a nice way
|
||||||
displaylogs();
|
displaylogs($testnum);
|
||||||
}
|
}
|
||||||
if(!$anyway) {
|
if(!$anyway) {
|
||||||
# a test failed, abort
|
# a test failed, abort
|
||||||
|
Loading…
Reference in New Issue
Block a user