[Tools 1/2] testbot: Rebuild TestLauncher as part of the Reconfig.

[Francois Gouget]

Currently the TestLauncher binaries are checked into Git which is wrong
and means they are effectively never updated. Now that Reconfig.pl rebuilds
them the TestBot server will be able to retrive the up-to-date binaries
and use them.
Modify the TestLauncher makefile so it does not overwrite the checked-in
TestLauncher binaries.

Signed-off-by: Francois Gouget <fgouget at codeweavers.com>
---

Once we've had a reconfig that confirms this works I'll send the patch 
that lets the TestBot server make use of these. Then more patches will 
fix TestLauncher.


 testbot/bin/build/Reconfig.pl     | 30 +++++++++++++++++++-----------
 testbot/src/TestLauncher/Makefile |  9 ++++++---
 2 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/testbot/bin/build/Reconfig.pl b/testbot/bin/build/Reconfig.pl
index e522e94d..dfc338b5 100755
--- a/testbot/bin/build/Reconfig.pl
+++ b/testbot/bin/build/Reconfig.pl
@@ -115,6 +115,20 @@ sub BuildTestAgentd()
   return 1;
 }
 
+sub BuildTestLauncher()
+{
+  system("( cd $::RootDir/src/TestLauncher && set -x && " .
+         "  time make -j$ncpus" .
+         ") >>$LogDir/Reconfig.log 2>&1");
+  if ($? != 0)
+  {
+    LogMsg "Build TestLauncher failed\n";
+    return !1;
+  }
+
+  return 1;
+}
+
 sub BuildNative()
 {
   mkdir "$DataDir/build-native" if (! -d "$DataDir/build-native");
@@ -173,17 +187,11 @@ if (! GitPull())
 
 CountCPUs();
 
-if (! BuildTestAgentd())
-{
-  exit(1);
-}
-
-if (! BuildNative())
-{
-  exit(1);
-}
-
-if (! BuildCross(32) || ! BuildCross(64))
+if (!BuildTestAgentd() ||
+    !BuildTestLauncher() ||
+    !BuildNative() ||
+    !BuildCross(32) ||
+    !BuildCross(64))
 {
   exit(1);
 }
diff --git a/testbot/src/TestLauncher/Makefile b/testbot/src/TestLauncher/Makefile
index 2bce2a19..06b37293 100644
--- a/testbot/src/TestLauncher/Makefile
+++ b/testbot/src/TestLauncher/Makefile
@@ -5,12 +5,15 @@ CROSSSTRIP32 = i686-w64-mingw32-strip
 CROSSCC64    = x86_64-w64-mingw32-gcc
 CROSSSTRIP64 = x86_64-w64-mingw32-strip
 
-all: $(bindir)/TestLauncher32.exe $(bindir)/TestLauncher64.exe
+all: TestLauncher32.exe TestLauncher64.exe
 
-$(bindir)/TestLauncher32.exe: TestLauncher.c
+TestLauncher32.exe: TestLauncher.c
 	$(CROSSCC32) -Wall -o $@ $<
 	$(CROSSSTRIP32) $@
 
-$(bindir)/TestLauncher64.exe: TestLauncher.c
+TestLauncher64.exe: TestLauncher.c
 	$(CROSSCC64) -Wall -o $@ $<
 	$(CROSSSTRIP64) $@
+
+clean:
+	rm -f TestLauncher32.exe TestLauncher64.exe
-- 
2.11.0