Francois Gouget : testbot/lib: Set the VM status to running in Task::Run() .
Alexandre Julliard
julliard at winehq.org
Tue May 6 12:32:38 CDT 2014
Module: tools
Branch: master
Commit: cfde7ca87f7a2608b2c13939d9d41a52799ac751
URL: http://source.winehq.org/git/tools.git/?a=commit;h=cfde7ca87f7a2608b2c13939d9d41a52799ac751
Author: Francois Gouget <fgouget at codeweavers.com>
Date: Tue May 6 12:43:14 2014 +0200
testbot/lib: Set the VM status to running in Task::Run().
It's Task::Run() that starts the WineRun* processes, so it should be its responsibility to update the VM status.
---
testbot/lib/WineTestBot/Jobs.pm | 5 +----
testbot/lib/WineTestBot/Tasks.pm | 8 ++++++--
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/testbot/lib/WineTestBot/Jobs.pm b/testbot/lib/WineTestBot/Jobs.pm
index b042bea..4532d4e 100644
--- a/testbot/lib/WineTestBot/Jobs.pm
+++ b/testbot/lib/WineTestBot/Jobs.pm
@@ -507,11 +507,8 @@ sub ScheduleOnHost($$$)
{
$IdleVMs{$VMKey} = 0;
$IdleCount--;
- $VM->Status("running");
- my ($ErrProperty, $ErrMessage) = $VM->Save();
- return $ErrMessage if (defined $ErrMessage);
- $ErrMessage = $Task->Run($Step);
+ my $ErrMessage = $Task->Run($Step);
return $ErrMessage if (defined $ErrMessage);
$Job->UpdateStatus();
diff --git a/testbot/lib/WineTestBot/Tasks.pm b/testbot/lib/WineTestBot/Tasks.pm
index fd848f2..dd22749 100644
--- a/testbot/lib/WineTestBot/Tasks.pm
+++ b/testbot/lib/WineTestBot/Tasks.pm
@@ -79,6 +79,11 @@ sub Run($$)
$self->Status("running");
$self->Save();
+ my $VM = $self->VM;
+ $VM->Status("running");
+ my ($ErrProperty, $ErrMessage) = $VM->Save();
+ return $ErrMessage if (defined $ErrMessage);
+
my $RunScript;
if ($Step->Type eq "build")
{
@@ -131,8 +136,7 @@ sub Run($$)
# ChildPid should be ignored anyway if Status is not 'running'.
$self->ChildPid($Pid);
$self->Started(time);
- my ($ErrProperty, $ErrMessage) = $self->Save();
-
+ ($ErrProperty, $ErrMessage) = $self->Save();
return $ErrMessage;
}
More information about the wine-cvs
mailing list