Module: tools Branch: master Commit: d7d1cf759402779fb3f7eaf16ec6c8c93c547b28 URL: https://source.winehq.org/git/tools.git/?a=commit;h=d7d1cf759402779fb3f7eaf1...
Author: Francois Gouget fgouget@codeweavers.com Date: Tue Jun 26 15:07:13 2018 +0200
testbot: Rename the Makefiles patch impact to MakeMakefiles.
This makes it clearer that it does not mean a makefile was modified, but that the make_makefiles script should be rerun.
Signed-off-by: Francois Gouget fgouget@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
testbot/bin/build/Build.pl | 2 +- testbot/bin/build/WineTest.pl | 2 +- testbot/lib/WineTestBot/PatchUtils.pm | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/testbot/bin/build/Build.pl b/testbot/bin/build/Build.pl index 4df1070..a3cb170 100755 --- a/testbot/bin/build/Build.pl +++ b/testbot/bin/build/Build.pl @@ -103,7 +103,7 @@ sub ApplyPatch($) }
my $Impacts = GetPatchImpact($PatchFile, "nounits"); - if ($Impacts->{Makefiles}) + if ($Impacts->{MakeMakefiles}) { InfoMsg "\nRunning make_makefiles\n"; system("cd '$DataDir/wine' && set -x && ./tools/make_makefiles"); diff --git a/testbot/bin/build/WineTest.pl b/testbot/bin/build/WineTest.pl index 01396f9..032ee46 100755 --- a/testbot/bin/build/WineTest.pl +++ b/testbot/bin/build/WineTest.pl @@ -100,7 +100,7 @@ sub ApplyPatch($) }
my $Impacts = GetPatchImpact($PatchFile, "nounits"); - if ($Impacts->{Makefiles}) + if ($Impacts->{MakeMakefiles}) { InfoMsg "\nRunning make_makefiles\n"; system("cd '$DataDir/wine' && set -x && ./tools/make_makefiles"); diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm index c37a1d3..b2bfe6a 100644 --- a/testbot/lib/WineTestBot/PatchUtils.pm +++ b/testbot/lib/WineTestBot/PatchUtils.pm @@ -178,7 +178,7 @@ sub _HandleFile($$$) if ($Change eq "new" or $Change eq "rm") { # This adds / removes a directory - $Impacts->{Makefiles} = 1; + $Impacts->{MakeMakefiles} = 1; } return; } @@ -216,7 +216,7 @@ sub _HandleFile($$$) { # This may or may not be a Wine patch but the new Makefile.in will be # added to the build by make_makefiles. - $Impacts->{WineBuild} = $Impacts->{Makefiles} = 1; + $Impacts->{WineBuild} = $Impacts->{MakeMakefiles} = 1; } } } @@ -289,7 +289,7 @@ sub GetPatchImpact($;$$) } elsif ($Line =~ m=^--- \w+/tools/make_makefiles$=) { - $Impacts->{WineBuild} = $Impacts->{Makefiles} = 1; + $Impacts->{WineBuild} = $Impacts->{MakeMakefiles} = 1; $Impacts->{IsWinePatch} = 1; } elsif ($Line =~ m=^--- /dev/null$=)