Module: tools Branch: master Commit: cd760081220709d18cfe5924a596c38987d52da6 URL: https://gitlab.winehq.org/winehq/tools/-/commit/cd760081220709d18cfe5924a596...
Author: Francois Gouget fgouget@codeweavers.com Date: Sun Oct 2 18:15:39 2022 +0200
testbot/LogUtils: Fix the summary flaky count check.
---
testbot/lib/WineTestBot/LogUtils.pm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 98fed6aa..ad708daf 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -365,9 +365,11 @@ sub _NewCurrentUnit($$) UnitsRE => $Unit, UnitSize => 0, LineFailures => 0, + LineFlaky => 0, LineTodos => 0, LineSkips => 0, SummaryFailures => 0, + SummaryFlaky => 0, SummaryTodos => 0, SummarySkips => 0, IsBroken => 0, @@ -424,6 +426,7 @@ sub _CloseTestUnit($$$) if ($Cur->{Dll} ne "" and !$Cur->{IsBroken}) { _CheckSummaryCounter($LogInfo, $Cur, "Failures", "failure"); + _CheckSummaryCounter($LogInfo, $Cur, "Flaky", "flaky"); _CheckSummaryCounter($LogInfo, $Cur, "Todos", "todo"); _CheckSummaryCounter($LogInfo, $Cur, "Skips", "skip"); } @@ -619,7 +622,7 @@ sub ParseWineTestReport($$$) { _CheckUnit($LogInfo, $Cur, $1, "flaky"); _AddReportError($LogInfo, $Cur, $LineNo, "$&$'"); - $Cur->{LineFailures}++; + $Cur->{LineFlaky}++; } elsif (($Cur->{Unit} ne "" and $Line =~ /($Cur->{UnitsRE}).c:\d+:[0-9.]* Test marked todo: /) or @@ -714,6 +717,7 @@ sub ParseWineTestReport($$$) # There may be more than one summary line due to child processes $Cur->{Pids}->{$Pid || 0} = 1; $Cur->{SummaryFailures} += $Failures; + $Cur->{SummaryFlaky} += $Flaky; $Cur->{SummaryTodos} += $Todos; $Cur->{SummarySkips} += $Skips; $LogInfo->{IsWineTest} = 1;