Francois Gouget : testbot/web: Compile patches on wow64 if 64 bit tests have been selected.
Alexandre Julliard
julliard at winehq.org
Wed Jun 27 12:45:44 CDT 2018
Module: tools
Branch: master
Commit: 1d8d8c4a2326f9da147a00d3c22bc06eb754db13
URL: https://source.winehq.org/git/tools.git/?a=commit;h=1d8d8c4a2326f9da147a00d3c22bc06eb754db13
Author: Francois Gouget <fgouget at codeweavers.com>
Date: Wed Jun 27 08:07:34 2018 +0200
testbot/web: Compile patches on wow64 if 64 bit tests have been selected.
Signed-off-by: Francois Gouget <fgouget at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
testbot/web/Submit.pl | 45 +++++++++++++++++++++++++--------------------
1 file changed, 25 insertions(+), 20 deletions(-)
diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl
index 9fa252a..38aa75f 100644
--- a/testbot/web/Submit.pl
+++ b/testbot/web/Submit.pl
@@ -858,30 +858,35 @@ sub OnSubmit($)
my $VMs = CreateVMs();
$VMs->AddFilter("Type", ["wine"]);
my $SortedKeys = $VMs->SortKeysBySortOrder($VMs->GetKeys());
- foreach my $VMKey (@$SortedKeys)
+ foreach my $Build ("win32", "wow64")
{
- my $VM = $VMs->GetItem($VMKey);
- my $FieldName = "vm_" . $self->CGI->escapeHTML($VMKey);
- next if (!$self->GetParam($FieldName)); # skip unselected VMs
+ next if ($Build eq "wow64" and !defined($self->GetParam("Run64")));
- if (!$Tasks)
+ foreach my $VMKey (@$SortedKeys)
{
- # First create the Wine test step
- my $WineStep = $Steps->Add();
- $WineStep->FileName($BaseName);
- $WineStep->FileType($FileType);
- $WineStep->InStaging(!1);
- $WineStep->Type("build");
- $WineStep->DebugLevel($self->GetParam("DebugLevel"));
- $WineStep->ReportSuccessfulTests(defined($self->GetParam("ReportSuccessfulTests")));
- $Tasks = $WineStep->Tasks;
- }
+ my $VM = $VMs->GetItem($VMKey);
+ my $FieldName = "vm_" . $self->CGI->escapeHTML($VMKey);
+ next if (!$self->GetParam($FieldName)); # skip unselected VMs
- # Then add a task for this VM
- my $Task = $Tasks->Add();
- $Task->VM($VM);
- $Task->CmdLineArg("win32");
- $Task->Timeout($WineReconfigTimeout);
+ if (!$Tasks)
+ {
+ # First create the Wine test step
+ my $WineStep = $Steps->Add();
+ $WineStep->FileName($BaseName);
+ $WineStep->FileType($FileType);
+ $WineStep->InStaging(!1);
+ $WineStep->Type("build");
+ $WineStep->DebugLevel($self->GetParam("DebugLevel"));
+ $WineStep->ReportSuccessfulTests(defined($self->GetParam("ReportSuccessfulTests")));
+ $Tasks = $WineStep->Tasks;
+ }
+
+ # Then add a task for this VM
+ my $Task = $Tasks->Add();
+ $Task->VM($VM);
+ $Task->CmdLineArg($Build);
+ $Task->Timeout($WineReconfigTimeout);
+ }
}
}
More information about the wine-cvs
mailing list