[tools] testbot/PatchUtils: Take into account module subdirectories.

Francois Gouget fgouget at codeweavers.com
Tue Apr 6 04:23:24 CDT 2021


Patches to files in in a subdirectory of a dll or program should be 
treated the same as regular dll/program patches.

Signed-off-by: Francois Gouget <fgouget at codeweavers.com>
---
Except for /tests/ which is the previous if of course.
---
 testbot/lib/WineTestBot/PatchUtils.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm
index b33ad9bd1..a7d33f685 100644
--- a/testbot/lib/WineTestBot/PatchUtils.pm
+++ b/testbot/lib/WineTestBot/PatchUtils.pm
@@ -240,7 +240,7 @@ sub _HandleFile($$$)
       $Impacts->{MakeMakefiles} = 1;
     }
   }
-  elsif ($FilePath =~ m~^(dlls|programs)/([^/]+)/([^/\s]+)$~)
+  elsif ($FilePath =~ m~^(dlls|programs)/([^/\s]+)/((?:[^\s]+/)?[^/\s]+)$~)
   {
     my ($Root, $PatchedDir, $File) = ($1, $2, $3);
 
-- 
2.20.1



More information about the wine-devel mailing list