[PATCH] testbot: Always recognize 'Task:' status lines in the logs

Francois Gouget fgouget at codeweavers.com
Tue Aug 21 00:56:07 CDT 2018


This opens the door to standardizing the format of the status lines.

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

diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm
index e6f9a27af..d39c81b38 100644
--- a/testbot/lib/WineTestBot/LogUtils.pm
+++ b/testbot/lib/WineTestBot/LogUtils.pm
@@ -60,16 +60,16 @@ sub ParseTaskLog($$)
     foreach my $Line (<$LogFile>)
     {
       chomp $Line;
-      if ($Line =~ /^$ResultPrefix: ok$/)
+      if ($Line =~ /^(?:$ResultPrefix|Task): ok$/)
       {
         $Result ||= "ok";
       }
-      elsif ($Line =~ /^$ResultPrefix: Patch failed to apply$/)
+      elsif ($Line =~ /^(?:$ResultPrefix|Task): Patch failed to apply$/)
       {
         $Result = "badpatch";
         last; # Should be the last and most specific message
       }
-      elsif ($Line =~ /^$ResultPrefix: /)
+      elsif ($Line =~ /^(?:$ResultPrefix|Task): /)
       {
         $Result = "failed";
       }
-- 
2.18.0




More information about the wine-devel mailing list