Module: tools Branch: master Commit: dff8b522a4c4e69eb0dd984a177d75ef50ff31fd URL: https://source.winehq.org/git/tools.git/?a=commit;h=dff8b522a4c4e69eb0dd984a...
Author: Francois Gouget fgouget@codeweavers.com Date: Mon Sep 30 03:23:31 2019 +0200
testbot: Tweak the name of the Windows WineTest jobs.
Better separate the bitness of the WineTest executable from the Windows bitness.
Signed-off-by: Francois Gouget fgouget@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
testbot/bin/CheckForWinetestUpdate.pl | 2 +- testbot/lib/WineTestBot/SpecialJobs.pm | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/testbot/bin/CheckForWinetestUpdate.pl b/testbot/bin/CheckForWinetestUpdate.pl index c3ec3a4..94d9750 100755 --- a/testbot/bin/CheckForWinetestUpdate.pl +++ b/testbot/bin/CheckForWinetestUpdate.pl @@ -400,7 +400,7 @@ if ($OptTypes{all64}) } elsif ($Create == 1) { - $Rc = 1 if ($OptTypes{all64} and !DoWindowsTest($OptVMKey, "exe64", "", $LatestBaseName)); + $Rc = 1 if ($OptTypes{all64} and !DoWindowsTest($OptVMKey, "exe64", "all", $LatestBaseName)); } }
diff --git a/testbot/lib/WineTestBot/SpecialJobs.pm b/testbot/lib/WineTestBot/SpecialJobs.pm index 0371084..360e1ff 100644 --- a/testbot/lib/WineTestBot/SpecialJobs.pm +++ b/testbot/lib/WineTestBot/SpecialJobs.pm @@ -148,10 +148,9 @@ sub AddWindowsTestJob($$$$$) my $NewJob = $Jobs->Add(); $NewJob->User(GetBatchUser()); $NewJob->Priority(($BaseJob eq "base" and $Build eq "exe32") ? 8 : 9); - my $Remarks = defined $VMKey ? "$VMKey VM" : - $Build eq "exe64" ? "64 bit VMs" : - "$BaseJob VMs"; - $NewJob->Remarks("WineTest: $Remarks"); + my $Remarks = ($Build eq "exe32" ? "32" : "64") ." bit WineTest: ". + (defined $VMKey ? "$VMKey VM" : "$BaseJob VMs"); + $NewJob->Remarks($Remarks);
# Add a task for each VM my $Tasks;