Module: tools Branch: master Commit: 2100194a5c76389c4242bce5cc1253958ee9d244 URL: https://source.winehq.org/git/tools.git/?a=commit;h=2100194a5c76389c4242bce5...
Author: Francois Gouget fgouget@codeweavers.com Date: Tue Aug 21 07:56:07 2018 +0200
testbot: Always recognize 'Task:' status lines in the logs.
This opens the door to standardizing the format of the status lines.
Signed-off-by: Francois Gouget fgouget@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
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 e6f9a27..d39c81b 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"; }