diff options
-rwxr-xr-x | tests/runtests.pl | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/tests/runtests.pl b/tests/runtests.pl index a6ba2012c..f365beaf8 100755 --- a/tests/runtests.pl +++ b/tests/runtests.pl @@ -2426,10 +2426,23 @@ open(CMDLOG, ">$CURLLOG") || sub displaylogcontent { my ($file)=@_; if(open(my $SINGLE, "<$file")) { - while(my $line = <$SINGLE>) { - chomp $line; - $line =~ s/\s*\!$//; - logmsg " $line\n"; + my $lfcount; + while(my $string = <$SINGLE>) { + $string =~ s/\r\n/\n/g; + $string =~ s/[\r\f\032]/\n/g; + $string .= "\n" unless ($string =~ /\n$/); + $lfcount = $string =~ tr/\n//; + if($lfcount == 1) { + $string =~ s/\n//; + $string =~ s/\s*\!$//; + logmsg " $string\n"; + } + else { + for my $line (split("\n", $string)) { + $line =~ s/\s*\!$//; + logmsg " $line\n"; + } + } } close($SINGLE); } |