Francois Gouget : testbot/WineSendLog: Fix detection of new errors.

[Alexandre Julliard]

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

Author: Francois Gouget <fgouget(a)codeweavers.com>
Date:   Tue Jun 26 13:30:15 2018 +0200

testbot/WineSendLog: Fix detection of new errors.

Comparing the compilation log with the reference WineTest report makes
no sense. So handle the WineTest reports and task logs separately.

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

---

 testbot/bin/WineSendLog.pl | 29 ++++++++++++++++++++++-------
 1 file changed, 22 insertions(+), 7 deletions(-)

diff --git a/testbot/bin/WineSendLog.pl b/testbot/bin/WineSendLog.pl
index 53b184c..29da4a0 100755
--- a/testbot/bin/WineSendLog.pl
+++ b/testbot/bin/WineSendLog.pl
@@ -439,13 +439,23 @@ EOF
     my $TaskDir = $StepTask->GetTaskDir();
 
     my ($BotFailure, $MessagesFromErr) = CheckErrLog("$TaskDir/err");
-    if (! $BotFailure)
+    if ($BotFailure)
+    {
+      # TestBot errors are not the developer's fault and prevent us from doing
+      # any meaningful analysis. So skip.
+      Error "A TestBot error was found in $TaskDir/err\n";
+      next;
+    }
+
+    my $MessagesFromLog = "";
+    my $LogFiles = GetLogFileNames($TaskDir);
+    my $LogName = $LogFiles->[0] || "log";
+    if ($LogName =~ /\.report$/)
     {
       $StepTask->FileName =~ m/^(.*)_test(64)?\.exe$/;
       my ($BaseName, $Bits) = ($1, $2 || "32");
       my $LatestName = "$DataDir/latest/" . $StepTask->VM->Name . "_$Bits";
       my ($LatestBotFailure, $Dummy) = CheckErrLog("$LatestName.err");
-      my $MessagesFromLog = "";
       if (! $LatestBotFailure)
       {
         if (defined($StepTask->CmdLineArg))
@@ -463,15 +473,20 @@ EOF
       {
         Error "BotFailure found in ${LatestName}.err\n";
       }
-      if ($MessagesFromErr || $MessagesFromLog)
+    }
+    elsif (open(my $LogFile, "<", "$TaskDir/$LogName"))
+    {
+      foreach my $Line (<$LogFile>)
       {
-        $Messages .= "\n=== " . $StepTask->GetTitle() . " ===\n" .
-                     $MessagesFromLog . $MessagesFromErr;
+        my $Category = GetLogLineCategory($Line);
+        $MessagesFromLog .= $Line if ($Category eq "error");
       }
+      close($LogFile);
     }
-    elsif ($BotFailure)
+    if ($MessagesFromErr || $MessagesFromLog)
     {
-      Error "BotFailure found in $TaskDir/err\n";
+      $Messages .= "\n=== " . $StepTask->GetTitle() . " ===\n" .
+                   $MessagesFromLog . $MessagesFromErr;
     }
   }