Francois Gouget : testbot: Prepare support for the "Task: test" status lines.

[Alexandre Julliard]

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

Author: Francois Gouget 
Date:   Thu Oct 18 11:15:14 2018 +0200

testbot: Prepare support for the "Task: test" status lines.

Signed-off-by: Francois Gouget 
Signed-off-by: Alexandre Julliard

---

testbot/lib/WineTestBot/LogUtils.pm | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm
index 1f3831b..4751f75 100644
--- a/testbot/lib/WineTestBot/LogUtils.pm
+++ b/testbot/lib/WineTestBot/LogUtils.pm
@@ -83,7 +83,11 @@ sub ParseTaskLog($)
     foreach my $Line (<$LogFile>)
     {
       chomp $Line;
-      if ($Line eq "Task: ok")
+      if ($Line eq "Task: tests")
+      {
+        ; # Ignore it for now
+      }
+      elsif ($Line eq "Task: ok")
       {
         $Result ||= "ok";
       }
@@ -122,6 +126,12 @@ sub GetLogLineCategory($)
 {
   my ($Line) = @_;

+  if (# Build messages
+      $Line =~ /^+ \S/ or
+      $Line =~ /^Task: (?:ok|tests)/)
+  {
+    return "info";
+  }
   if (# Git errors
       $Line =~ /^CONFLICT / or
       $Line =~ /^error: patch failed:/ or
@@ -130,7 +140,7 @@ sub GetLogLineCategory($)
       $Line =~ /: error: / or
       $Line =~ /^make: [*]{3} No rule to make target / or
       $Line =~ /^Makefile:[0-9]+: recipe for target .* failed$/ or
-      $Line =~ /^Task: (?!ok)/ or
+      $Line =~ /^Task: / or
       # Typical perl errors
       _IsPerlError($Line))
   {
@@ -150,12 +160,6 @@ sub GetLogLineCategory($)
   {
     return "boterror";
   }
-  if (# Build messages
-      $Line =~ /^+ \S/ or
-      $Line =~ /^Task: ok/)
-  {
-    return "info";
-  }

return "none";
 }