Francois Gouget : testbot/web: Allow sumitting jobs to verify patches compile on Wine.

[Alexandre Julliard]

Module: tools
Branch: master
Commit: 1714aea235ef48b8dd939ca2fd1a5802d4db7e2b
URL:    https://source.winehq.org/git/tools.git/?a=commit;h=1714aea235ef48b8dd939ca2...

Author: Francois Gouget 
Date:   Thu Jun 21 15:02:41 2018 +0200

testbot/web: Allow sumitting jobs to verify patches compile on Wine.

For now the Wine VMs are unchecked by default since all they do is a
compilation check which is mostly redundant with the regular build step.

Signed-off-by: Francois Gouget 
Signed-off-by: Alexandre Julliard

---

testbot/web/Submit.pl | 43 ++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 42 insertions(+), 1 deletion(-)

diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl
index afebc72..9fa252a 100644
--- a/testbot/web/Submit.pl
+++ b/testbot/web/Submit.pl
@@ -244,10 +244,14 @@ sub GenerateFields($)
       {
           $VMs->AddFilter("Type", ["win64"]);
       }
-      else
+      elsif ($self->{FileType} eq "exe32")
       {
           $VMs->AddFilter("Type", ["win32", "win64"]);
       }
+      else
+      {
+          $VMs->AddFilter("Type", ["win32", "win64", "wine"]);
+      }
       if ($self->{ShowAll})
       {
         # All but the retired and deleted ones
@@ -272,6 +276,10 @@ sub GenerateFields($)
           $Status = " [". $VM->Status ."]";
           $Checked = undef;
         }
+        elsif ($VM->Type eq "wine")
+        {
+          $Checked = undef;
+        }
         if ($Checked and
             ($self->GetParam("Page") == 1 || $self->GetParam($FieldName)))
         {
@@ -844,6 +852,39 @@ sub OnSubmit($)
     }
   }

+  if ($FileType eq "patchdlls")
+  {
+    my $Tasks;
+    my $VMs = CreateVMs();
+    $VMs->AddFilter("Type", ["wine"]);
+    my $SortedKeys = $VMs->SortKeysBySortOrder($VMs->GetKeys());
+    foreach my $VMKey (@$SortedKeys)
+    {
+      my $VM = $VMs->GetItem($VMKey);
+      my $FieldName = "vm_" . $self->CGI->escapeHTML($VMKey);
+      next if (!$self->GetParam($FieldName)); # skip unselected VMs
+
+      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("win32");
+      $Task->Timeout($WineReconfigTimeout);
+    }
+  }
+
   # Now save it all (or whatever's left to save)
   my ($ErrKey, $ErrProperty, $ErrMessage) = $Jobs->Save();
   if (defined($ErrMessage))