Francois Gouget : testbot/PatchUtils: Propagate all build flags.

[Alexandre Julliard]

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

Author: Francois Gouget <fgouget at codeweavers.com>
Date:   Tue Jan 12 18:18:37 2021 +0100

testbot/PatchUtils: Propagate all build flags.

MakeErrors, MakeFir, MakeOpenGL and MakeUnicode must be propagated to
the last patchset part too.

Signed-off-by: Francois Gouget <fgouget at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 testbot/lib/WineTestBot/PatchUtils.pm | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm
index ffe0ec4..26c16c4 100644
--- a/testbot/lib/WineTestBot/PatchUtils.pm
+++ b/testbot/lib/WineTestBot/PatchUtils.pm
@@ -396,9 +396,10 @@ sub GetPatchImpacts($)
       $Impacts->{BuildModules} = {};
 
       # Also backup the build-related fields.
-      foreach my $Field ("Autoconf", "MakeMakefiles", "MakeRequests",
-                         "MakeVulkan", "PatchedRoot", "PatchedModules",
-                         "PatchedTests")
+      foreach my $Field ("Autoconf", "MakeErrors", "MakeFir", "MakeMakefiles",
+                         "MakeOpenGL", "MakeRequests", "MakeUnicode",
+                         "MakeVulkan",
+                         "PatchedRoot", "PatchedModules", "PatchedTests")
       {
         $PastImpacts->{$Field} = $Impacts->{$Field};
         $Impacts->{$Field} = undef;
@@ -490,10 +491,12 @@ sub GetPatchImpacts($)
     # ... even if the patch was in previous parts
     if ($PastImpacts)
     {
-      $Impacts->{Autoconf} ||= $PastImpacts->{Autoconf};
-      $Impacts->{MakeMakefiles} ||= $PastImpacts->{MakeMakefiles};
-      $Impacts->{MakeRequests} ||= $PastImpacts->{MakeRequests};
-      $Impacts->{MakeVulkan} ||= $PastImpacts->{MakeVulkan};
+      foreach my $Field ("Autoconf", "MakeErrors", "MakeFir", "MakeMakefiles",
+                         "MakeOpenGL", "MakeRequests", "MakeUnicode",
+                         "MakeVulkan")
+      {
+        $Impacts->{$Field} ||= $PastImpacts->{$Field};
+      }
       $Impacts->{RebuildRoot} ||= $PastImpacts->{PatchedRoot};
       $Impacts->{RebuildModules} ||= $PastImpacts->{PatchedModules};
       map { $Impacts->{BuildModules}->{$_} = 1 } keys %{$PastImpacts->{BuildModules}};