[3/6] testbot/build: Staging is handled before starting the build task.
Francois Gouget
fgouget at codeweavers.com
Wed Mar 13 10:51:08 CDT 2013
---
WineRunBuild.pl is the only script to call HandleStaging()
(WineRunReconfig.pl does not for instance). Furthermore HandleStaging()
is called in ScheduleJobs() already. So I suspect that initially staging
was done in the task scripts, then got moved to the Engine and
WineRunBuild.pl got forgotten in the update.
testbot/bin/WineRunBuild.pl | 9 +--------
1 file changed, 1 insertion(+), 8 deletions(-)
diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl
index 7fd87b2..236d3d0 100755
--- a/testbot/bin/WineRunBuild.pl
+++ b/testbot/bin/WineRunBuild.pl
@@ -217,15 +217,8 @@ if (! defined($BaseName))
FatalError "Can't determine base name\n", $FullErrFileName, $Job, $Task;
}
-my $ErrMessage = $Step->HandleStaging($JobId);
-if (defined($ErrMessage))
-{
- FatalError "$ErrMessage\n", $FullErrFileName, $Job, $Task;
-}
-
$VM->Status('running');
-my $ErrProperty;
-($ErrProperty, $ErrMessage) = $VM->Save();
+my ($ErrProperty, $ErrMessage) = $VM->Save();
if (defined($ErrMessage))
{
FatalError "Can't set VM status to running: $ErrMessage\n",
--
1.7.10.4
More information about the wine-patches
mailing list