Module: tools Branch: master Commit: 99a40fdf458c266c4524996fa99c8f8b31d93aea URL: http://source.winehq.org/git/tools.git/?a=commit;h=99a40fdf458c266c4524996fa...
Author: Francois Gouget fgouget@codeweavers.com Date: Wed Mar 22 01:16:22 2017 +0100
testbot/WineRunTask: Clarify the timeout reporting.
Signed-off-by: Francois Gouget fgouget@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
testbot/bin/WineRunTask.pl | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index dc9e9e6..8799b0b 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -444,7 +444,7 @@ if (!defined $TA->Wait($Pid, $Timeout, $Keepalive)) my $ErrMessage = $TA->GetLastError(); if ($ErrMessage =~ /timed out waiting for the child process/) { - LogTaskError("The test timed out\n"); + LogTaskError("The task timed out\n"); $TestFailures = 1; $TimedOut = 1; } @@ -574,7 +574,8 @@ if ($TA->GetFile($RptFileName, $FullLogFileName)) } elsif ($Rc == 258) { - # This is a timeout + # This is a timeout. Those are already reported based on the + # done line. $LogFailures++; } elsif ($LineFailures == 0 and $Rc != 0)