[tools] testbot/PatchUtils: Detect when make_unicode needs to be run.
Francois Gouget
fgouget at codeweavers.com
Fri Mar 13 05:12:19 CDT 2020
Signed-off-by: Francois Gouget <fgouget at codeweavers.com>
---
testbot/lib/Build/Utils.pm | 10 ++++++++++
testbot/lib/WineTestBot/PatchUtils.pm | 5 +++++
2 files changed, 15 insertions(+)
diff --git a/testbot/lib/Build/Utils.pm b/testbot/lib/Build/Utils.pm
index cc61e31d7a..c4250781e3 100644
--- a/testbot/lib/Build/Utils.pm
+++ b/testbot/lib/Build/Utils.pm
@@ -157,6 +157,16 @@ sub ApplyPatch($$)
return undef;
}
}
+ if ($Impacts->{MakeUnicode})
+ {
+ InfoMsg "\nRunning make_unicode\n";
+ system("cd '$DataDir/$Dir/' && set -x && ./tools/make_unicode");
+ if ($? != 0)
+ {
+ LogMsg "make_unicode failed\n";
+ return undef;
+ }
+ }
if ($Impacts->{MakeVulkan})
{
InfoMsg "\nRunning make_vulkan\n";
diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm
index f55dc4bdfe..eaa9868942 100644
--- a/testbot/lib/WineTestBot/PatchUtils.pm
+++ b/testbot/lib/WineTestBot/PatchUtils.pm
@@ -341,6 +341,11 @@ sub GetPatchImpacts($)
$Impacts->{PatchedRoot} = $Impacts->{MakeVulkan} = 1;
$Impacts->{IsWinePatch} = 1;
}
+ elsif ($Line =~ m=^--- \w+/tools/make_unicode$=)
+ {
+ $Impacts->{PatchedRoot} = $Impacts->{MakeUnicode} = 1;
+ $Impacts->{IsWinePatch} = 1;
+ }
elsif ($Line =~ m=^--- /dev/null$=)
{
$Change = "new";
--
2.20.1
More information about the wine-devel
mailing list