Francois Gouget : testbot: Remove the HasConfigure patch impact.
Alexandre Julliard
julliard at winehq.org
Wed Sep 19 16:25:33 CDT 2018
Module: tools
Branch: master
Commit: 5141879b5e9bd6423322eb21c57e5e34f5f53e73
URL: https://source.winehq.org/git/tools.git/?a=commit;h=5141879b5e9bd6423322eb21c57e5e34f5f53e73
Author: Francois Gouget <fgouget at codeweavers.com>
Date: Wed Sep 19 12:09:42 2018 +0200
testbot: Remove the HasConfigure patch impact.
Even if the patch provides an updated configure file the TestBot needs
to be able to recreate it in case another patch does not provide it.
Furthermore skipping the autoconf steps correctly is complex when a
patchset changes configure.ac in part 1 and provides configure in part
2, or provides both in part 1 and only some other configure.ac change
in part 2, etc.
So it's better to just run autoconf whenever configure.ac is patched.
Signed-off-by: Francois Gouget <fgouget at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
testbot/lib/Build/Utils.pm | 2 +-
testbot/lib/WineTestBot/PatchUtils.pm | 4 ----
2 files changed, 1 insertion(+), 5 deletions(-)
diff --git a/testbot/lib/Build/Utils.pm b/testbot/lib/Build/Utils.pm
index 2fe7a97..2e6cc85 100644
--- a/testbot/lib/Build/Utils.pm
+++ b/testbot/lib/Build/Utils.pm
@@ -125,7 +125,7 @@ sub ApplyPatch($$)
}
}
- if ($Impacts->{Autoconf} && !$Impacts->{HasConfigure})
+ if ($Impacts->{Autoconf})
{
InfoMsg "\nRunning autoconf\n";
system("cd '$DataDir/$Dir' && set -x && autoconf");
diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm
index 4ce5bf4..476757f 100644
--- a/testbot/lib/WineTestBot/PatchUtils.pm
+++ b/testbot/lib/WineTestBot/PatchUtils.pm
@@ -317,10 +317,6 @@ sub GetPatchImpacts($;$)
{
$Impacts->{WineBuild} = $Impacts->{Autoconf} = 1;
}
- elsif ($Line =~ m=^--- \w+/configure$=)
- {
- $Impacts->{WineBuild} = $Impacts->{HasConfigure} = 1;
- }
elsif ($Line =~ m=^--- \w+/tools/make_makefiles$=)
{
$Impacts->{WineBuild} = $Impacts->{MakeMakefiles} = 1;
More information about the wine-cvs
mailing list