Francois Gouget : testbot/LogUtils: Don't modify ParseWineTestReport()'s timeout lines.

[Alexandre Julliard]

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

Author: Francois Gouget <fgouget(a)codeweavers.com>
Date:   Fri Feb 21 11:37:05 2020 +0100

testbot/LogUtils: Don't modify ParseWineTestReport()'s timeout lines.

Changing the timeout lines for reporting prevented the parser from
recognizing them and lead to extraneous missing failure / todo / skip
errors.

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

---

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

diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm
index 734d322..12decee 100644
--- a/testbot/lib/WineTestBot/LogUtils.pm
+++ b/testbot/lib/WineTestBot/LogUtils.pm
@@ -532,17 +532,18 @@ sub ParseWineTestReport($$$)
     if (GetReportLineCategory($Line) eq "error")
     {
       # Make the timeout messages more user-friendly
-      if ($Line =~ m/^[^:]+:([^:]*):[0-9a-f]+ done \(258\)/)
+      my $ErrLine = $Line;
+      if ($ErrLine =~ /^[^:]+:([^:]*):[0-9a-f]+ done \(258\)/)
       {
         my $Unit = $1;
-        $Line = $Unit ne "" ? "$Unit: Timeout" : "Timeout";
+        $ErrLine = $Unit ne "" ? "$Unit: Timeout" : "Timeout";
       }
 
       if (!$CurGroup)
       {
         $CurGroup = _AddLogGroup($LogInfo, $CurGroupName, $CurGroupLineNo || $LineNo);
       }
-      _AddLogError($LogInfo, $CurGroup, $Line, $LineNo);
+      _AddLogError($LogInfo, $CurGroup, $ErrLine, $LineNo);
     }
 
     if ($Line =~ m%^([_.a-z0-9-]+):([_a-z0-9]*) (start|skipped) (?:-|[/_.a-z0-9-]+) (?:-|[.0-9a-f]+)\r?$%)