Francois Gouget : testbot/LogUtils: Let ParseWineTestReport() do the error detection.
Alexandre Julliard
julliard at winehq.org
Mon Mar 1 15:28:34 CST 2021
Module: tools
Branch: master
Commit: 91edb4e2ed9650cae7192694be7b4ad002ac82a6
URL: https://source.winehq.org/git/tools.git/?a=commit;h=91edb4e2ed9650cae7192694be7b4ad002ac82a6
Author: Francois Gouget <fgouget at codeweavers.com>
Date: Mon Mar 1 16:05:23 2021 +0100
testbot/LogUtils: Let ParseWineTestReport() do the error detection.
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>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
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 267dcd9..4d2619c 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);
More information about the wine-cvs
mailing list