Module: tools Branch: master Commit: 818aebb2e41bbcec3cacd0723b59a9e867320732 URL: https://gitlab.winehq.org/winehq/tools/-/commit/818aebb2e41bbcec3cacd0723b59...
Author: Francois Gouget fgouget@codeweavers.com Date: Mon Oct 24 19:00:59 2022 +0200
testbot: Fix the tasks failure count.
TestFailures is supposed to count all failures, including the preexisting (aka old) and flaky ones. Checking whether any of these failures is new must be done by analyzing the content of the task's .errors files.
---
testbot/bin/WineRunTask.pl | 4 ++-- testbot/bin/WineRunWineTest.pl | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index 0641bb54..67ba3288 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -562,8 +562,8 @@ if ($TA->GetFile($RptFileName, "$TaskDir/$RptFileName")) my $ErrMessages = SnapshotLatestReport($Task, $RptFileName); LogTaskError("$_\n") for (@$ErrMessages);
- # $LogInfo->{Failures} can legitimately be undefined in case of a timeout - $TaskFailures += $LogInfo->{Failures} || 0; + # $LogInfo->{ErrCount} can legitimately be undefined in case of a timeout + $TaskFailures += $LogInfo->{ErrCount} || 0; my $LogErrMsg = CreateLogErrorsCache($LogInfo, $Task); LogTaskError("$LogErrMsg\n") if (defined $LogErrMsg); } diff --git a/testbot/bin/WineRunWineTest.pl b/testbot/bin/WineRunWineTest.pl index 62a7fc5b..d0e30d1c 100755 --- a/testbot/bin/WineRunWineTest.pl +++ b/testbot/bin/WineRunWineTest.pl @@ -578,8 +578,8 @@ foreach my $RptFileName (@$ReportNames) my $ErrMessages = SnapshotLatestReport($Task, $RptFileName); LogTaskError("$_\n") for (@$ErrMessages);
- # $LogInfo->{Failures} can legitimately be undefined in case of a timeout - $TaskFailures += $LogInfo->{Failures} || 0; + # $LogInfo->{ErrCount} can legitimately be undefined in case of a timeout + $TaskFailures += $LogInfo->{ErrCount} || 0; my $LogErrMsg = CreateLogErrorsCache($LogInfo, $Task); LogTaskError("$LogErrMsg\n") if (defined $LogErrMsg); }