[PATCH] testbot/WineRunBuild: Trust the build task's missions.
Francois Gouget
fgouget at codeweavers.com
Thu Nov 29 04:53:39 CST 2018
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 <fgouget at codeweavers.com>
---
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 5a3a683fbb..68e6be4c0c 100755
--- a/testbot/bin/WineRunBuild.pl
+++ b/testbot/bin/WineRunBuild.pl
@@ -335,22 +335,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}})
--
2.19.1
More information about the wine-devel
mailing list