Francois Gouget : testbot/PatchUtils: Detect when make_errors needs to be run.

[Alexandre Julliard]

Module: tools
Branch: master
Commit: 74397efc8963baed242aad9c9cc59fb5539d8945
URL:    https://source.winehq.org/git/tools.git/?a=commit;h=74397efc8963baed242aad9c...

Author: Francois Gouget <fgouget(a)codeweavers.com>
Date:   Wed Mar 11 09:53:56 2020 +0100

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

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 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 13f9699..cc61e31 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 49bf101..f55dc4b 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;