[tools] testbot/PatchUtils: Always track modified paths, if only for deletions.
Francois Gouget
fgouget at codeweavers.com
Mon Jan 25 08:39:05 CST 2021
We track all deleted and (re)added files. Global files and scripts
should be no exception even if they are unlikely to be deleted /
(re)added.
Signed-off-by: Francois Gouget <fgouget at codeweavers.com>
---
testbot/lib/WineTestBot/PatchUtils.pm | 30 +++++++++++++++++----------
1 file changed, 19 insertions(+), 11 deletions(-)
diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm
index 974ff8eb6..5588df204 100644
--- a/testbot/lib/WineTestBot/PatchUtils.pm
+++ b/testbot/lib/WineTestBot/PatchUtils.pm
@@ -138,9 +138,9 @@ sub _LoadWineFiles()
# These paths are too generic to be proof that this is a Wine patch.
my $AmbiguousPathsRe = join('|',
'Makefile\.in$',
- # aclocal.m4 gets special treatment
- # configure gets special treatment
- # configure.ac gets special treatment
+ 'aclocal\.m4$',
+ 'configure$',
+ 'configure\.ac$',
'include/Makefile\.in$',
'include/config\.h\.in$',
'po/',
@@ -313,42 +313,50 @@ sub GetPatchImpacts($)
my ($Path, $Change);
while (my $Line = <$fh>)
{
- if ($Line =~ m=^--- \w+/(?:aclocal\.m4|configure\.ac)$=)
+ if ($Line =~ m=^--- \w+/(aclocal\.m4|configure\.ac)$=)
{
+ $Path = $1;
$Impacts->{PatchedRoot} = $Impacts->{Autoconf} = 1;
}
- elsif ($Line =~ m=^--- \w+/tools/make_makefiles$=)
+ elsif ($Line =~ m=^--- \w+/(tools/make_makefiles)$=)
{
+ $Path = $1;
$Impacts->{PatchedRoot} = $Impacts->{MakeMakefiles} = 1;
$Impacts->{IsWinePatch} = 1;
}
- elsif ($Line =~ m=^--- \w+/server/protocol\.def$=)
+ elsif ($Line =~ m=^--- \w+/(server/protocol\.def)$=)
{
+ $Path = $1;
$Impacts->{PatchedRoot} = $Impacts->{MakeRequests} = 1;
$Impacts->{IsWinePatch} = 1;
}
- elsif ($Line =~ m=^--- \w+/dlls/dsound/make_fir$=)
+ elsif ($Line =~ m=^--- \w+/(dlls/dsound/make_fir)$=)
{
+ $Path = $1;
$Impacts->{MakeFir} = 1;
$Impacts->{IsWinePatch} = 1;
}
- elsif ($Line =~ m=^--- \w+/(?:dlls/ntdll/make_errors|dlls/ntdll/error\.c|include/ntstatus\.h|include/winerror\.h)$=)
+ elsif ($Line =~ m=^--- \w+/(dlls/ntdll/make_errors|dlls/ntdll/error\.c|include/ntstatus\.h|include/winerror\.h)$=)
{
+ $Path = $1;
$Impacts->{MakeErrors} = 1;
$Impacts->{IsWinePatch} = 1;
}
- elsif ($Line =~ m=^--- \w+/(?:dlls/opengl32/make_opengl|dlls/opengl32/winegl\.xml|include/wine/wgl_driver\.h)$=)
+ elsif ($Line =~ m=^--- \w+/(dlls/opengl32/make_opengl|dlls/opengl32/winegl\.xml|include/wine/wgl_driver\.h)$=)
{
+ $Path = $1;
$Impacts->{PatchedRoot} = $Impacts->{MakeOpenGL} = 1;
$Impacts->{IsWinePatch} = 1;
}
- elsif ($Line =~ m=^--- \w+/dlls/winevulkan/make_vulkan$=)
+ elsif ($Line =~ m=^--- \w+/(dlls/winevulkan/make_vulkan)$=)
{
+ $Path = $1;
$Impacts->{PatchedRoot} = $Impacts->{MakeVulkan} = 1;
$Impacts->{IsWinePatch} = 1;
}
- elsif ($Line =~ m=^--- \w+/tools/make_unicode$=)
+ elsif ($Line =~ m=^--- \w+/(tools/make_unicode)$=)
{
+ $Path = $1;
$Impacts->{PatchedRoot} = $Impacts->{MakeUnicode} = 1;
$Impacts->{IsWinePatch} = 1;
}
--
2.20.1
More information about the wine-devel
mailing list