[tools] testbot/LogUtils: Let ParseWineTestReport() do the error detection.

Francois Gouget fgouget at codeweavers.com
Mon Mar 1 09:05:23 CST 2021


This reduces duplication and lets ParseWineTestReport()'s more
sophisticated analysis have the last word on which report lines contain
errors.

Signed-off-by: Francois Gouget <fgouget at codeweavers.com>
---
This is needed to allow proper handling of IgnoreExceptions lines.

 testbot/lib/WineTestBot/LogUtils.pm | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm
index 267dcd9ec..4d2619ccc 100644
--- a/testbot/lib/WineTestBot/LogUtils.pm
+++ b/testbot/lib/WineTestBot/LogUtils.pm
@@ -328,14 +328,6 @@ sub GetReportLineCategory($)
   {
     return "skip";
   }
-  if ($Line =~ /: Test (?:failed|succeeded inside todo block): / or
-      $Line =~ /Fatal: test .* does not exist/ or
-      $Line =~ / done \(258\)/ or
-      $Line =~ /: unhandled exception [0-9a-fA-F]{8} (?:at|in) / or
-      $Line =~ /^Unhandled exception: /)
-  {
-    return "error";
-  }
   if ($Line =~ /^[_.a-z0-9-]+:[_a-z0-9]* start / or
       $Line =~ /: this is the last test seen before the exception/)
   {
@@ -736,14 +728,6 @@ sub ParseWineTestReport($$$)
       }
       $Cur->{Rc} = $Rc;
     }
-    elsif (GetReportLineCategory($Line) eq "error")
-    {
-      # This should only happen on very garbled lines, or if there is an
-      # inconsistency between GetReportLineCategory() and
-      # ParseWineTestReport().
-      _AddReportError($LogInfo, $Cur, $LineNo, $Line);
-    }
-
   }
   $Cur->{IsBroken} = 1 if ($LogInfo->{TaskTimedOut});
   _CloseTestUnit($LogInfo, $Cur, 1);
-- 
2.20.1



More information about the wine-devel mailing list