Francois Gouget : testbot: Limit chomping of log lines to CR and LF.

[Alexandre Julliard]

Module: tools
Branch: master
Commit: 89b225b4d421a71f4e0802dbb096b756013d27d2
URL:    https://source.winehq.org/git/tools.git/?a=commit;h=89b225b4d421a71f4e0802db...

Author: Francois Gouget <fgouget(a)codeweavers.com>
Date:   Wed Feb 19 04:17:07 2020 +0100

testbot: Limit chomping of log lines to CR and LF.

This fixes handling of failures (and todos, etc) where the message
starts with a linefeed.

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 testbot/lib/WineTestBot/LogUtils.pm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm
index 5ed4563..863cca6 100644
--- a/testbot/lib/WineTestBot/LogUtils.pm
+++ b/testbot/lib/WineTestBot/LogUtils.pm
@@ -254,7 +254,8 @@ sub ParseTaskLog($)
   foreach my $Line (<$LogFile>)
   {
     $LineNo++;
-    $Line =~ s/\s*$//; # chomp \r, \n and more
+    chomp $Line;
+    $Line =~ s/\r+$//;
 
     if (GetLogLineCategory($Line) eq "error")
     {
@@ -525,7 +526,8 @@ sub ParseWineTestReport($$$)
   {
     $LineNo++;
     $Cur->{UnitSize} += length($Line);
-    $Line =~ s/\s*$//; # chomp \r, \n and more
+    chomp $Line;
+    $Line =~ s/\r+$//;
 
     if (GetReportLineCategory($Line) eq "error")
     {