Francois Gouget : testbot/build: Run make depend before rebuilding the tests.

[Alexandre Julliard]

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

Author: Francois Gouget <fgouget(a)codeweavers.com>
Date:   Tue May 31 19:15:40 2022 +0200

testbot/build: Run make depend before rebuilding the tests.

'make buildtest' only generates the headers needed by the tests. So it's
possible for a patch to introduce a dependency on a header that was not
build by Reconfig.

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

---

 testbot/bin/build/Build.pl | 4 ++--
 testbot/lib/Build/Utils.pm | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/testbot/bin/build/Build.pl b/testbot/bin/build/Build.pl
index 23ab685..8502f21 100755
--- a/testbot/bin/build/Build.pl
+++ b/testbot/bin/build/Build.pl
@@ -167,8 +167,8 @@ if ($DataDir =~ /'/)
 my $Impacts = ApplyPatch("wine", $PatchFile);
 
 if (!$Impacts or
-    !BuildWine($TaskMissions, 0, "exe32", undef, "buildtests") or
-    !BuildWine($TaskMissions, 0, "exe64", undef, "buildtests"))
+    !BuildWine($TaskMissions, 0, "exe32", undef, ["depend", "buildtests"]) or
+    !BuildWine($TaskMissions, 0, "exe64", undef, ["depend", "buildtests"]))
 {
   exit(1);
 }
diff --git a/testbot/lib/Build/Utils.pm b/testbot/lib/Build/Utils.pm
index 9e73cba..8a84f5e 100644
--- a/testbot/lib/Build/Utils.pm
+++ b/testbot/lib/Build/Utils.pm
@@ -330,7 +330,7 @@ our $TRY_WERROR = 2;
 sub BuildWine($$$$;$)
 {
   my ($TaskMissions, $Flags, $Build, $Configure, $Targets) = @_;
-  $Targets ||= "";
+  $Targets ||= [""];
 
   return 1 if (!$TaskMissions->{Builds}->{$Build});
   # Rebuild from scratch to make sure cruft will not accumulate
@@ -344,14 +344,14 @@ sub BuildWine($$$$;$)
   {
     $Rc = system("cd '$DataDir/wine-$Build' && set -x && ".
                  "time ../wine/configure $Configure --enable-werror && ".
-                 "time make -j$CPUCount $Targets");
+                 join(" && ", map { "time make -j$CPUCount $_" } @$Targets));
     LogMsg "With -Werror the $Build Wine build fails\n" if ($Rc);
   }
   if ($Rc)
   {
     $Rc = system("cd '$DataDir/wine-$Build' && set -x && ".
                  (defined $Configure ? "time ../wine/configure $Configure && " : "").
-                 "time make -j$CPUCount $Targets");
+                 join(" && ", map { "time make -j$CPUCount $_" } @$Targets));
   }
   if ($Rc)
   {