[PATCH 1/2] testbot/WineReconfig: Use the PE TestLauncher executable.

[Francois Gouget]

Wine VMs now should have MinGW to compile Wine so they can use it to
produce the PE TestLauncher executable as well.

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com>
---

This is the bit that was missing for the '--build' patch that did not 
apply.

 testbot/bin/build/WineReconfig.pl | 13 +------------
 testbot/bin/build/WineTest.pl     |  2 +-
 testbot/lib/Build/Utils.pm        | 10 +++++++++-
 3 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/testbot/bin/build/WineReconfig.pl b/testbot/bin/build/WineReconfig.pl
index 9f0544e3..ff0c11c8 100755
--- a/testbot/bin/build/WineReconfig.pl
+++ b/testbot/bin/build/WineReconfig.pl
@@ -71,18 +71,6 @@ sub BuildWine($$$$;$)
     return !1;
   }
 
-  # Compile TestLauncher
-  my $Bits = ($Build =~ /64/) ? "64" : "32";
-  $WithWine ||= ".";
-  system("cd '$DataDir/wine-$Build' && set -x && ".
-         "gcc -m$Bits -c -o TestLauncher.o ../../src/TestLauncher/TestLauncher.c -fPIC -Iinclude -I../wine/include && ".
-         "'$WithWine/tools/winegcc/winegcc' -B'$WithWine/tools/winebuild' --sysroot=. -m$Bits -o TestLauncher.exe.so TestLauncher.o");
-  if ($? != 0)
-  {
-    LogMsg "The $Build TestLauncher build failed\n";
-    return !1;
-  }
-
   return 1;
 }
 
@@ -266,6 +254,7 @@ if ($DataDir =~ /'/)
 #
 
 exit(1) if (!BuildNativeTestAgentd());
+exit(1) if (!BuildTestLauncher());
 exit(1) if ($OptUpdate and !GitPull("wine"));
 exit(1) if ($OptAddOns and !UpdateAddOns());
 exit(1) if ($OptBuild and !UpdateWineBuilds($TaskMissions, $OptNoRm));
diff --git a/testbot/bin/build/WineTest.pl b/testbot/bin/build/WineTest.pl
index a3997361..4b9a4b99 100755
--- a/testbot/bin/build/WineTest.pl
+++ b/testbot/bin/build/WineTest.pl
@@ -197,7 +197,7 @@ sub TestExe($$$)
   }
 
   # Run the test executable
-  RunWine($Mission, "TestLauncher.exe.so",
+  RunWine($Mission, GetTestLauncher($Mission),
           "-t 120 ". ShArgv2Cmd($FileName, @$Args)
           ." >'$DataDir/$BaseName.report'");
 
diff --git a/testbot/lib/Build/Utils.pm b/testbot/lib/Build/Utils.pm
index d31db820..02253922 100644
--- a/testbot/lib/Build/Utils.pm
+++ b/testbot/lib/Build/Utils.pm
@@ -29,7 +29,7 @@ use Exporter 'import';
 our @EXPORT = qw(GetToolName InfoMsg LogMsg Error
                  GitPull ApplyPatch
                  GetCPUCount BuildNativeTestAgentd BuildWindowsTestAgentd
-                 BuildTestLauncher UpdateAddOns
+                 GetTestLauncher BuildTestLauncher UpdateAddOns
                  SetupWineEnvironment RunWine CreateWinePrefix);
 
 use Digest::SHA;
@@ -219,6 +219,14 @@ sub BuildWindowsTestAgentd()
   return 1;
 }
 
+sub GetTestLauncher($)
+{
+  my ($Mission) = @_;
+
+  my $Bits = ($Mission->{Build} =~ /64/) ? "64" : "32";
+  return "$::RootDir/src/TestLauncher/TestLauncher$Bits.exe";
+}
+
 sub BuildTestLauncher()
 {
   InfoMsg "\nRebuilding TestLauncher\n";
-- 
2.20.1

[PATCH 2/2] testbot: Only build testagentd and TestLauncher if given --build.

[Francois Gouget]

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com>
---
 testbot/bin/build/Reconfig.pl     | 5 +++--
 testbot/bin/build/WineReconfig.pl | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/testbot/bin/build/Reconfig.pl b/testbot/bin/build/Reconfig.pl
index 72725bf4..f0ed128d 100755
--- a/testbot/bin/build/Reconfig.pl
+++ b/testbot/bin/build/Reconfig.pl
@@ -219,8 +219,9 @@ if (! -d "$DataDir/staging" and ! mkdir "$DataDir/staging")
 # Run the builds
 #
 
-exit(1) if (!BuildNativeTestAgentd() or !BuildWindowsTestAgentd());
-exit(1) if (!BuildTestLauncher());
+exit(1) if ($OptBuild and !BuildNativeTestAgentd());
+exit(1) if ($OptBuild and !BuildWindowsTestAgentd());
+exit(1) if ($OptBuild and !BuildTestLauncher());
 exit(1) if ($OptUpdate and !GitPull("wine"));
 exit(1) if ($OptBuild and !UpdateWineBuilds($TaskMissions, $OptNoRm));
 
diff --git a/testbot/bin/build/WineReconfig.pl b/testbot/bin/build/WineReconfig.pl
index ff0c11c8..835be460 100755
--- a/testbot/bin/build/WineReconfig.pl
+++ b/testbot/bin/build/WineReconfig.pl
@@ -253,8 +253,8 @@ if ($DataDir =~ /'/)
 # Run the builds and/or tests
 #
 
-exit(1) if (!BuildNativeTestAgentd());
-exit(1) if (!BuildTestLauncher());
+exit(1) if ($OptBuild and !BuildNativeTestAgentd());
+exit(1) if ($OptBuild and !BuildTestLauncher());
 exit(1) if ($OptUpdate and !GitPull("wine"));
 exit(1) if ($OptAddOns and !UpdateAddOns());
 exit(1) if ($OptBuild and !UpdateWineBuilds($TaskMissions, $OptNoRm));
-- 
2.20.1