[PATCH] testbot: Build VMs expect their missions to be a list of builds.
Francois Gouget
fgouget at codeweavers.com
Mon Nov 19 09:36:55 CST 2018
So replace 'build' with the actual builds that should be run.
A consequence is that build VMs too may have more than one mission
since they can build both exe32 and exe64 binaries in one go.
Signed-off-by: Francois Gouget <fgouget at codeweavers.com>
---
testbot/lib/WineTestBot/VMs.pm | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm
index e7cd277494..6a08bc1aea 100644
--- a/testbot/lib/WineTestBot/VMs.pm
+++ b/testbot/lib/WineTestBot/VMs.pm
@@ -315,7 +315,7 @@ sub PutColValue($$$)
}
my $_SupportedMissions = {
- "build" => { "build" => 1 },
+ "build" => { "exe32" => 1, "exe64" => 1 },
"win32" => { "exe32" => 1 },
"win64" => { "exe32" => 1, "exe64" => 1 },
"wine" => { "win32" => 1, "wow32" => 1, "wow64" => 1 },
@@ -336,9 +336,10 @@ sub Validate($)
return ("Missions", $ErrMessage) if (defined $ErrMessage);
foreach my $TaskMissions (@$Missions)
{
- if ($self->Type ne "wine" and @{$TaskMissions->{Missions}} > 1)
+ if ($self->Type !~ /^(?:build|wine)$/ and
+ @{$TaskMissions->{Missions}} > 1)
{
- return ("Missions", "Only wine VMs can handle more than one mission per task");
+ return ("Missions", "Only the build and wine VMs can handle more than one mission per task");
}
foreach my $Mission (@{$TaskMissions->{Missions}})
{
--
2.19.1
More information about the wine-devel
mailing list