Further improve displaying of individual logfiles

diff --git a/tests/runtests.pl b/tests/runtests.pl
index a6ba2012cd150bad9040fb118c79deb7224ec84e..f365beaf88e83a733de6f9ae624639b5b5afd266 100755 (executable)
--- 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);
     }