Francois Gouget : testbot/TestWTBS: Allow matching errors in testbot.log.

[Alexandre Julliard]

Module: tools
Branch: master
Commit: 9b028fed31426847eb847bb0e3e22873bfdeca49
URL:    https://source.winehq.org/git/tools.git/?a=commit;h=9b028fed31426847eb847bb0e3e22873bfdeca49

Author: Francois Gouget <fgouget at codeweavers.com>
Date:   Fri Jan 22 17:02:38 2021 +0100

testbot/TestWTBS: Allow matching errors in testbot.log.

Tasks have three types of logs:
- *.report files that collect the test output.
- task.log which collects the messages from the VM-side process that
  starts the Wine test / build.
- testbot.log which collects the server-side messages when some
  inconsistency is detected or the connection to the VM is lost.
Each get their own .errors file but so far only errors in the first two
types of logs could be matched.

Signed-off-by: Francois Gouget <fgouget at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 testbot/tests/TestWTBS | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/testbot/tests/TestWTBS b/testbot/tests/TestWTBS
index 5cadc5d..e3909a2 100755
--- a/testbot/tests/TestWTBS
+++ b/testbot/tests/TestWTBS
@@ -300,7 +300,7 @@ sub LoadTestInfo($)
   foreach my $RawGroupName (@{$RawInfo->{ErrGroupNames}})
   {
     my $GroupName = lcfirst($RawGroupName);
-    if ($GroupName =~ s/^(tasks|build|tests|win|win32|win64|wine)\.(log|report)\.//)
+    if ($GroupName =~ s/^(tasks|build|tests|win|win32|win64|wine)\.(report|log|testbot)\.//)
     {
       my $ErrInfo = ($TestInfo->{$1}->{"$2.errors"} ||= {});
       push @{$ErrInfo->{ErrGroupNames}}, $GroupName;
@@ -395,12 +395,13 @@ sub IsMailingListJob($)
 }
 
 =pod
-=item <tasks.(log|report).groupname>
+=item <tasks.(report|log|testbot).groupname>
 
 Verifies the presence of new errors in the specified error log or report
 of the tasks in the specified category. For this, list the group and errors
 that are expected to appear; where the group name is prefixed by the task
-category and either 'log' or 'report'.
+category and either 'report' for the test reports, 'log' for 'task.log', or
+'testbot' for 'testbot.log'.
 
 For instance:
 g 0 tests.report.kernel32
@@ -531,6 +532,11 @@ sub CheckTask($$$$)
         map { $TestUnits->{wine}->{$_} = 1 } (keys %$ReportTestUnits);
       }
     }
+    elsif ($LogName =~ /^testbot\./)
+    {
+      $LogType = "testbot";
+    }
+
     if ($TaskInfo->{"$LogType.errors"})
     {
       CheckLogErrors($LogInfo, $TaskInfo->{"$LogType.errors"},