Francois Gouget : testbot: Update the TestLauncher binaries when updating Wine.

[Alexandre Julliard]

Module: tools
Branch: master
Commit: 0fd8f624e7a2888d5ba19959405da436053e8ac2
URL:    http://source.winehq.org/git/tools.git/?a=commit;h=0fd8f624e7a2888d5ba199594...

Author: Francois Gouget <fgouget(a)codeweavers.com>
Date:   Wed Jun 14 09:50:45 2017 +0200

testbot: Update the TestLauncher binaries when updating Wine.

And remove the checked-in TestLauncher binaries since we no longer
need them.

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

---

 testbot/bin/WineRunReconfig.pl         |  13 +++++++++++++
 testbot/bin/WineRunTask.pl             |   4 ++--
 testbot/bin/windows/TestLauncher32.exe | Bin 432844 -> 0 bytes
 testbot/bin/windows/TestLauncher64.exe | Bin 115348 -> 0 bytes
 4 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl
index c99c1ab..135a5c3 100755
--- a/testbot/bin/WineRunReconfig.pl
+++ b/testbot/bin/WineRunReconfig.pl
@@ -376,6 +376,19 @@ elsif (!defined $TAError)
 if ($NewStatus eq "completed")
 {
   use File::Copy;
+  for my $Bitness ("32", "64")
+  {
+    Debug(Elapsed($Start), " Retrieving the $Bitness bit TestLauncher to '$TaskDir/TestLauncher$Bitness.exe'\n");
+    if ($TA->GetFile("../src/TestLauncher/TestLauncher$Bitness.exe", "$TaskDir/TestLauncher$Bitness.exe"))
+    {
+      copy "$TaskDir/TestLauncher$Bitness.exe", "$DataDir/latest/TestLauncher$Bitness.exe";
+    }
+    elsif (!defined $TAError)
+    {
+      $TAError = "An error occurred while retrieving the $Bitness bit TestLauncher: ". $TA->GetLastError();
+    }
+  }
+
   Debug(Elapsed($Start), " Retrieving the updated test list '$TaskDir/testlist.txt'\n");
   if ($TA->GetFile("testlist.txt", "$TaskDir/testlist.txt"))
   {
diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl
index cd74119..22339b7 100755
--- a/testbot/bin/WineRunTask.pl
+++ b/testbot/bin/WineRunTask.pl
@@ -362,8 +362,8 @@ my $IsWineTest = 1;
 if ($Step->Type eq "single")
 {
   my $TestLauncher = "TestLauncher" . ($FileType eq "exe64" ? "64" : "32") . ".exe";
-  Debug(Elapsed($Start), " Sending '$BinDir/windows/$TestLauncher'\n");
-  if (!$TA->SendFile("$BinDir/windows/$TestLauncher", $TestLauncher, 0))
+  Debug(Elapsed($Start), " Sending 'latest/$TestLauncher'\n");
+  if (!$TA->SendFile("$DataDir/latest/$TestLauncher", $TestLauncher, 0))
   {
     FatalTAError($TA, "Could not copy TestLauncher to the VM");
   }
diff --git a/testbot/bin/windows/TestLauncher32.exe b/testbot/bin/windows/TestLauncher32.exe
deleted file mode 100755
index 3272652..0000000
Binary files a/testbot/bin/windows/TestLauncher32.exe and /dev/null differ
diff --git a/testbot/bin/windows/TestLauncher64.exe b/testbot/bin/windows/TestLauncher64.exe
deleted file mode 100755
index f18a904..0000000
Binary files a/testbot/bin/windows/TestLauncher64.exe and /dev/null differ