Francois Gouget : testbot/build: Always rebuild the native tools.

[Alexandre Julliard]

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

Author: Francois Gouget <fgouget(a)codeweavers.com>
Date:   Wed May 30 08:05:15 2018 +0200

testbot/build: Always rebuild the native tools.

It does not take long and it is actually hard to really know when to
rebuild them if taking into account their libs/ and include/
dependencies.

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

---

 testbot/bin/build/Build.pl            | 20 ++++++++------------
 testbot/lib/WineTestBot/PatchUtils.pm |  6 +-----
 2 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/testbot/bin/build/Build.pl b/testbot/bin/build/Build.pl
index 5e6b370..03733ce 100755
--- a/testbot/bin/build/Build.pl
+++ b/testbot/bin/build/Build.pl
@@ -83,7 +83,7 @@ sub ApplyPatch($)
   if ($? != 0)
   {
     LogMsg "Patch failed to apply\n";
-    return -1;
+    return 0;
   }
 
   my $Impacts = GetPatchImpact($PatchFile, "nounits");
@@ -96,7 +96,7 @@ sub ApplyPatch($)
     if ($? != 0)
     {
       LogMsg "make_makefiles failed\n";
-      return -1;
+      return 0;
     }
   }
 
@@ -109,11 +109,11 @@ sub ApplyPatch($)
     if ($? != 0)
     {
        LogMsg "Autoconf failed\n";
-       return -1;
+       return 0;
     }
   }
 
-  return $Impacts->{Tools};
+  return 1;
 }
 
 my $ncpus;
@@ -249,21 +249,17 @@ else
   FatalError "Invalid number of bits $BitIndicators\n";
 }
 
-my $NeedBuildNative = ApplyPatch($PatchFile);
-if ($NeedBuildNative < 0)
+if (!ApplyPatch($PatchFile))
 {
   exit(1);
 }
 
 CountCPUs();
 
-if ($NeedBuildNative)
+InfoMsg "Building tools\n";
+if (!BuildNative())
 {
-  InfoMsg "Building tools\n";
-  if (!BuildNative())
-  {
-    exit(1);
-  }
+  exit(1);
 }
 
 if ($Run32 && ! BuildTestExecutable($BaseName, $PatchType, 32))
diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm
index 2000c90..6c72e16 100644
--- a/testbot/lib/WineTestBot/PatchUtils.pm
+++ b/testbot/lib/WineTestBot/PatchUtils.pm
@@ -142,11 +142,7 @@ sub GetPatchImpact($;$)
     }
     elsif ($Line =~ m=^--- \w+/tools/make_makefiles$=)
     {
-      $Impacts->{Makefiles} = $Impacts->{Tools} = 1;
-    }
-    elsif ($Line =~ m=^--- \w+/tools/(?:makedep\.c|make_xftmpl\.c|sfnt2fon|winebuild|winegcc|widl|wmc|wrc)$=)
-    {
-      $Impacts->{Tools} = 1;
+      $Impacts->{Makefiles} = 1;
     }
     elsif ($Line =~ m=^--- /dev/null$=)
     {