Francois Gouget : testbot/WineRun*: Rename the timeout WrapUpAndExit() parameter.

[Alexandre Julliard]

Module: tools
Branch: master
Commit: 8135e0a60e9ababa222a17d8c9d0f70f4a8ac515
URL:    https://source.winehq.org/git/tools.git/?a=commit;h=8135e0a60e9ababa222a17d8...

Author: Francois Gouget 
Date:   Wed Jun 20 02:31:57 2018 +0200

testbot/WineRun*: Rename the timeout WrapUpAndExit() parameter.

It is a boolean indicating whether the task timed out, not the timeout
value in seconds.

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

---

testbot/bin/WineRunBuild.pl    | 4 ++--
 testbot/bin/WineRunReconfig.pl | 4 ++--
 testbot/bin/WineRunTask.pl     | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl
index eab33bc..1bc6cff 100755
--- a/testbot/bin/WineRunBuild.pl
+++ b/testbot/bin/WineRunBuild.pl
@@ -196,11 +196,11 @@ sub LogTaskError($)

sub WrapUpAndExit($;$$)
 {
-  my ($Status, $Retry, $Timeout) = @_;
+  my ($Status, $Retry, $TimedOut) = @_;
   my $NewVMStatus = $Status eq 'queued' ? 'offline' : 'dirty';
   my $VMResult = $Status eq "boterror" ? "boterror" :
                  $Status eq "queued" ? "error" :
-                 $Timeout ? "timeout" : "";
+                 $TimedOut ? "timeout" : "";

my $TestFailures;
   my $Tries = $Task->TestFailures || 0;
diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl
index e7b447e..fe69fc3 100755
--- a/testbot/bin/WineRunReconfig.pl
+++ b/testbot/bin/WineRunReconfig.pl
@@ -195,12 +195,12 @@ sub LogTaskError($)

sub WrapUpAndExit($;$$)
 {
-  my ($Status, $Retry, $Timeout) = @_;
+  my ($Status, $Retry, $TimedOut) = @_;
   my $NewVMStatus = $Status eq 'queued' ? 'offline' :
                     $Status eq 'completed' ? 'idle' : 'dirty';
   my $VMResult = $Status eq "boterror" ? "boterror" :
                  $Status eq "queued" ? "error" :
-                 $Timeout ? "timeout" : "";
+                 $TimedOut ? "timeout" : "";

my $TestFailures;
   my $Tries = $Task->TestFailures || 0;
diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl
index 3b0ccbc..e10656e 100755
--- a/testbot/bin/WineRunTask.pl
+++ b/testbot/bin/WineRunTask.pl
@@ -226,11 +226,11 @@ sub LogTaskError($)

sub WrapUpAndExit($;$$$)
 {
-  my ($Status, $TestFailures, $Retry, $Timeout) = @_;
+  my ($Status, $TestFailures, $Retry, $TimedOut) = @_;
   my $NewVMStatus = $Status eq 'queued' ? 'offline' : 'dirty';
   my $VMResult = $Status eq "boterror" ? "boterror" :
                  $Status eq "queued" ? "error" :
-                 $Timeout ? "timeout" : "";
+                 $TimedOut ? "timeout" : "";

Debug(Elapsed($Start), " Taking a screenshot\n");
   TakeScreenshot($VM, "$TaskDir/screenshot.png");