Francois Gouget : testbot/LogUtils: Lines have no trailing CRs in ParseWineTestReport().

[Alexandre Julliard]

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

Author: Francois Gouget <fgouget at codeweavers.com>
Date:   Fri Feb 21 11:37:18 2020 +0100

testbot/LogUtils: Lines have no trailing CRs in ParseWineTestReport().

The trailing CRs are removed at the start of the parser's loop.

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

---

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

diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm
index 12decee..f7b6f42 100644
--- a/testbot/lib/WineTestBot/LogUtils.pm
+++ b/testbot/lib/WineTestBot/LogUtils.pm
@@ -546,7 +546,7 @@ sub ParseWineTestReport($$$)
       _AddLogError($LogInfo, $CurGroup, $ErrLine, $LineNo);
     }
 
-    if ($Line =~ m%^([_.a-z0-9-]+):([_a-z0-9]*) (start|skipped) (?:-|[/_.a-z0-9-]+) (?:-|[.0-9a-f]+)\r?$%)
+    if ($Line =~ m%^([_.a-z0-9-]+):([_a-z0-9]*) (start|skipped) (?:-|[/_.a-z0-9-]+) (?:-|[.0-9a-f]+)$%)
     {
       my ($Dll, $Unit, $Type) = ($1, $2, $3);
 
@@ -563,7 +563,7 @@ sub ParseWineTestReport($$$)
       $CurGroupLineNo = $LineNo;
       $CurGroup = undef;
     }
-    elsif ($Line =~ /^([_.a-z0-9-]+)\.c:\d+: Subtest ([_.a-z0-9-]+)\r?$/)
+    elsif ($Line =~ /^([_.a-z0-9-]+)\.c:\d+: Subtest ([_.a-z0-9-]+)$/)
     {
       my ($Unit, $SubUnit) = ($1, $2);
       if ($Cur->{Units}->{$Unit})