Francois Gouget : testbot/WineRunBuild: Trust the build task's missions.

[Alexandre Julliard]

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

Author: Francois Gouget 
Date:   Thu Nov 29 11:53:39 2018 +0100

testbot/WineRunBuild: Trust the build task's missions.

We now set the build task's missions field with the list of builds to
perform so there is no need to recompute it in WineRunBuild.

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

---

testbot/bin/WineRunBuild.pl | 28 +++++++++++-----------------
 1 file changed, 11 insertions(+), 17 deletions(-)

diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl
index 5a3a683..68e6be4 100755
--- a/testbot/bin/WineRunBuild.pl
+++ b/testbot/bin/WineRunBuild.pl
@@ -336,22 +336,6 @@ if ($Step->FileType ne "patch")

#
-# Figure out what to build
-#
-
-my (%Missions, %TestExes);
-foreach my $TestStep (@{$Job->Steps->GetItems()})
-{
-  if (($TestStep->PreviousNo || 0) == $Step->No and
-      $TestStep->FileType =~ /^exe/)
-  {
-    $Missions{$TestStep->FileType} = 1;
-    $TestExes{$TestStep->FileName} = $TestStep->FileType;
-  }
-}
-
-
-#
 # Run the build
 #

@@ -364,7 +348,7 @@ if (!$TA->SendFile($FileName, "staging/patch.diff", 0))
 }
 my $Script = "#!/bin/sh\n".
              "( set -x\n".
-             "  ../bin/build/Build.pl patch.diff ". join(":", sort keys %Missions) ."\n".
+             "  ../bin/build/Build.pl patch.diff ". $Task->Missions ."\n".
              ") >Build.log 2>&1\n";
 Debug(Elapsed($Start), " Sending the script: [$Script]\n");
 if (!$TA->SendFileFromString($Script, "task", $TestAgent::SENDFILE_EXE))
@@ -446,6 +430,16 @@ FatalTAError(undef, $TAError) if (defined $TAError);
 # Grab the executables for the next steps
 #

+my %TestExes;
+foreach my $TestStep (@{$Job->Steps->GetItems()})
+{
+  if (($TestStep->PreviousNo || 0) == $Step->No and
+      $TestStep->FileType =~ /^exe/)
+  {
+    $TestExes{$TestStep->FileName} = $TestStep->FileType;
+  }
+}
+
 my $Impacts = GetPatchImpacts($FileName);
 my $StepDir = $Step->CreateDir();
 foreach my $TestInfo (values %{$Impacts->{Tests}})