[tools] testbot/PatchUtils: Detect when make_errors needs to be run.

[Francois Gouget]

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 13f969920a..cc61e31d7a 100644
--- a/testbot/lib/Build/Utils.pm
+++ b/testbot/lib/Build/Utils.pm
@@ -137,6 +137,16 @@ sub ApplyPatch($$)
       return undef;
     }
   }
+  if ($Impacts->{MakeErrors})
+  {
+    InfoMsg "\nRunning make_errors\n";
+    system("cd '$DataDir/$Dir/' && set -x && ./dlls/ntdll/make_errors");
+    if ($? != 0)
+    {
+      LogMsg "make_errors failed\n";
+      return undef;
+    }
+  }
   if ($Impacts->{MakeOpenGL})
   {
     InfoMsg "\nRunning make_opengl\n";
diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm
index 49bf10126b..f55dc4bdfe 100644
--- a/testbot/lib/WineTestBot/PatchUtils.pm
+++ b/testbot/lib/WineTestBot/PatchUtils.pm
@@ -326,6 +326,11 @@ sub GetPatchImpacts($)
       $Impacts->{PatchedRoot} = $Impacts->{MakeRequests} = 1;
       $Impacts->{IsWinePatch} = 1;
     }
+    elsif ($Line =~ m=^--- \w+/(?:dlls/ntdll/make_errors|dlls/ntdll/error\.c|include/ntstatus\.h|include/winerror\.h)$=)
+    {
+      $Impacts->{MakeErrors} = 1;
+      $Impacts->{IsWinePatch} = 1;
+    }
     elsif ($Line =~ m=^--- \w+/(?:dlls/opengl32/make_opengl|dlls/opengl32/winegl\.xml|include/wine/wgl_driver\.h)$=)
     {
       $Impacts->{PatchedRoot} = $Impacts->{MakeOpenGL} = 1;
-- 
2.20.1