Module: tools Branch: master Commit: c291da53a3de9f5a1b8488c9d76aafff38f5186c URL: https://gitlab.winehq.org/winehq/tools/-/commit/c291da53a3de9f5a1b8488c9d76a...
Author: Francois Gouget fgouget@codeweavers.com Date: Sat Oct 29 03:09:40 2022 +0200
testbot/TestWTBS: Fix some failure count checks.
---
testbot/tests/TestWTBS | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/testbot/tests/TestWTBS b/testbot/tests/TestWTBS index 935f9e13..06ea6a60 100755 --- a/testbot/tests/TestWTBS +++ b/testbot/tests/TestWTBS @@ -329,7 +329,7 @@ sub LoadTestInfo($) $TestInfo->{$TaskType}->{$Field} = $RawInfo->{$Entry}; $HasTestInfo = 1; } - elsif ($Entry !~ /^(?:CurGroup|ErrCount|MsgGroups|MsgGroupNames|LineNo|LogName|LogPath|NewCount)$/) + elsif ($Entry !~ /^(?:CurGroup|eCount|eNew|MsgGroups|MsgGroupNames|LineNo|LogName|LogPath)$/) { fail("$FileName: $Entry is not a valid property name"); } @@ -343,8 +343,8 @@ sub LoadTestInfo($) push @{$ErrInfo->{MsgGroupNames}}, $GroupName; my $MsgGroup = $RawInfo->{MsgGroups}->{$RawGroupName}; $ErrInfo->{MsgGroups}->{$GroupName} = $MsgGroup; - $ErrInfo->{ErrCount} += @{$MsgGroup->{Messages}}; - $ErrInfo->{ErrNew} += $MsgGroup->{ErrNew} || 0; + $ErrInfo->{eCount} += @{$MsgGroup->{Messages}}; + $ErrInfo->{eNew} += $MsgGroup->{eNew} || 0; $HasTestInfo = 1; } else @@ -991,9 +991,9 @@ sub CheckTask($$$$)
if (CheckValue($MissionInfo->{TestFailures})) { - ok(($LogInfo->{ErrCount} || 0) <= $MissionInfo->{TestFailures}, + ok(($LogInfo->{eCount} || 0) <= $MissionInfo->{TestFailures}, "Check Failures of $LogName in task ". TaskKeyStr($Task)) - or diag("report error count = ", ($LogInfo->{ErrCount} || 0), ", expected at most $MissionInfo->{TestFailures}"); + or diag("report error count = ", ($LogInfo->{eCount} || 0), ", expected at most $MissionInfo->{TestFailures}"); $ReportFailures += $MissionInfo->{TestFailures}; } else