[tools] testbot/PatchUtils: There is no need to migrate the make_* flags.

Francois Gouget fgouget at codeweavers.com
Wed Mar 31 05:37:06 CDT 2021


They impact the build, and only the build, no matter which patchset part
they appear in.
This is confirmed by the old code which moved them from $Impacts to
$PastImpacts and then back to $Impacts.

Signed-off-by: Francois Gouget <fgouget at codeweavers.com>
---
 testbot/lib/WineTestBot/PatchUtils.pm | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm
index 796457a21..87e4508ba 100644
--- a/testbot/lib/WineTestBot/PatchUtils.pm
+++ b/testbot/lib/WineTestBot/PatchUtils.pm
@@ -423,10 +423,7 @@ sub GetPatchImpacts($)
       $Impacts->{BuildModules} = {};
 
       # Also backup the build-related fields.
-      foreach my $Field ("Autoconf", "MakeErrors", "MakeFir", "MakeMakefiles",
-                         "MakeOpenGL", "MakeRequests", "MakeUnicode",
-                         "MakeVulkan",
-                         "PatchedRoot", "PatchedModules", "PatchedTests")
+      foreach my $Field ("PatchedRoot", "PatchedModules", "PatchedTests")
       {
         $PastImpacts->{$Field} = $Impacts->{$Field};
         $Impacts->{$Field} = undef;
@@ -518,12 +515,6 @@ sub GetPatchImpacts($)
     # ... even if the patch was in previous parts
     if ($PastImpacts)
     {
-      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}};
-- 
2.20.1



More information about the wine-devel mailing list