Francois Gouget : testbot/CheckForWinetestUpdate: Clean up handling of the 'other' VMs.
Alexandre Julliard
julliard at winehq.org
Tue Sep 17 11:55:07 CDT 2019
Module: tools
Branch: master
Commit: 73912a3cd7a214f89230ddfeb7ee9640edee15b9
URL: https://source.winehq.org/git/tools.git/?a=commit;h=73912a3cd7a214f89230ddfeb7ee9640edee15b9
Author: Francois Gouget <fgouget at codeweavers.com>
Date: Tue Sep 17 12:33:37 2019 +0200
testbot/CheckForWinetestUpdate: Clean up handling of the 'other' VMs.
The job is called 'WineTest: other VMs' so calling the corresponding
option 'other32' is clearer.
Also, setting $BaseJob to 'other' when appropriate simplifies building
the job description.
Signed-off-by: Francois Gouget <fgouget at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
testbot/bin/CheckForWinetestUpdate.pl | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/testbot/bin/CheckForWinetestUpdate.pl b/testbot/bin/CheckForWinetestUpdate.pl
index 590226c..b4672a7 100755
--- a/testbot/bin/CheckForWinetestUpdate.pl
+++ b/testbot/bin/CheckForWinetestUpdate.pl
@@ -67,7 +67,7 @@ my %WineTestUrls = (
my %TaskTypes = (build => "Update and rebuild Wine on the build VMs.",
base32 => "Run WineTest on the 32 bit Windows VMs with the 'base' role.",
- winetest32 => "Run WineTest on the 32 bit Windows VMs with the 'winetest' role.",
+ other32 => "Run WineTest on the 32 bit Windows VMs with the 'winetest' role.",
all64 => "Run WineTest on the all the 64 bit Windows VMs.",
wine => "Update, rebuild and run WineTest on the Wine VMs.");
@@ -171,7 +171,7 @@ sub AddJob($$$)
{
my ($BaseJob, $LatestBaseName, $Build) = @_;
- my $Remarks = ($Build eq "exe64" ? "64-bit" : $BaseJob ? "base" : "other");
+ my $Remarks = $Build eq "exe64" ? "64-bit" : $BaseJob;
$Remarks = "WineTest: $Remarks VMs";
Debug("Creating the '$Remarks' job\n");
@@ -181,7 +181,7 @@ sub AddJob($$$)
$VMs->AddFilter("Type", ["win64"]);
$VMs->AddFilter("Role", ["base", "winetest"]);
}
- elsif ($BaseJob)
+ elsif ($BaseJob eq "base")
{
$VMs->AddFilter("Type", ["win32", "win64"]);
$VMs->AddFilter("Role", ["base"]);
@@ -202,7 +202,7 @@ sub AddJob($$$)
my $Jobs = CreateJobs();
my $NewJob = $Jobs->Add();
$NewJob->User(GetBatchUser());
- $NewJob->Priority($BaseJob && $Build eq "exe32" ? 8 : 9);
+ $NewJob->Priority($BaseJob eq "base" and $Build eq "exe32" ? 8 : 9);
$NewJob->Remarks($Remarks);
# Add a task for each VM
@@ -458,7 +458,7 @@ if (defined $Usage)
#
my $Rc = 0;
-if ($OptTypes{build} or $OptTypes{base32} or $OptTypes{winetest32} or
+if ($OptTypes{build} or $OptTypes{base32} or $OptTypes{other32} or
$OptTypes{wine})
{
my ($Create, $LatestBaseName) = UpdateWineTest($OptCreate, "exe32");
@@ -473,7 +473,7 @@ if ($OptTypes{build} or $OptTypes{base32} or $OptTypes{winetest32} or
# arbitrarily do it only for 32-bit executables to avoid redundant updates.
$Rc = 1 if ($OptTypes{build} and !AddReconfigJob("build"));
$Rc = 1 if ($OptTypes{base32} and !AddJob("base", $LatestBaseName, "exe32"));
- $Rc = 1 if ($OptTypes{winetest32} and !AddJob("", $LatestBaseName, "exe32"));
+ $Rc = 1 if ($OptTypes{other32} and !AddJob("other", $LatestBaseName, "exe32"));
$Rc = 1 if ($OptTypes{wine} and !AddReconfigJob("wine"));
}
More information about the wine-cvs
mailing list