[PATCH 1/2] testbot: Avoid some unneeded regular expressions when parsing logs.

[Francois Gouget]

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com>
---
 testbot/lib/WineTestBot/LogUtils.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm
index 6caa0212c2..1f3831bba9 100644
--- a/testbot/lib/WineTestBot/LogUtils.pm
+++ b/testbot/lib/WineTestBot/LogUtils.pm
@@ -83,11 +83,11 @@ sub ParseTaskLog($)
     foreach my $Line (<$LogFile>)
     {
       chomp $Line;
-      if ($Line =~ /^Task: ok$/)
+      if ($Line eq "Task: ok")
       {
         $Result ||= "ok";
       }
-      elsif ($Line =~ /^Task: Patch failed to apply$/)
+      elsif ($Line eq "Task: Patch failed to apply")
       {
         $Result = "badpatch";
         last; # Should be the last and most specific message
-- 
2.19.1

[PATCH 2/2] testbot: Prepare support for the "Task: test" status lines.

[Francois Gouget]

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com>
---

These will help to more reliably report build issues as such for Wine 
VMs.

 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 1f3831bba9..4751f75e53 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";
 }
-- 
2.19.1