[tools] testbot/WineRunReconfig: Only the build VMs produce TestAgentd.

Francois Gouget fgouget at codeweavers.com
Mon Feb 14 09:57:44 CST 2022


Usually this is not an issue because the TestBot server has the 
TestAgentd.exe binary and the build log does not contain the "Updated 
TestAgentd.exe" line. But during the initial setup the TestBot server 
would still try to download TestAgentd.exe from the Wine VMs which would 
cause a failure.

Signed-off-by: Francois Gouget <fgouget at codeweavers.com>
---
Also I apparently manually built TestAgentd.exe when preparing the Wine 
VMs (or WineReconfig.pl used to do so) so they do have an (out of date) 
binary available for download.

 testbot/bin/WineRunReconfig.pl | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl
index c6f2342916..373e657dc4 100755
--- a/testbot/bin/WineRunReconfig.pl
+++ b/testbot/bin/WineRunReconfig.pl
@@ -457,11 +457,20 @@ FatalTAError(undef, $TAError) if (defined $TAError);
 if ($NewStatus eq "completed")
 {
   use File::Copy;
-  foreach my $FileName ("../src/testagentd/TestAgentd.exe",
-                        "../src/TestLauncher/TestLauncher32.exe",
-                        "../src/TestLauncher/TestLauncher64.exe",
-                        "latest/winefiles.txt",
-                        "latest/wine-parentsrc.txt")
+  my @FileNames = (
+    # TestLauncher is used by both Windows and Wine VMs
+    "../src/TestLauncher/TestLauncher32.exe",
+    "../src/TestLauncher/TestLauncher64.exe",
+    # Needed by the TestBot server
+    "latest/winefiles.txt",
+    "latest/wine-parentsrc.txt",
+  );
+  if ($VM->Type eq "build")
+  {
+    # Only needed for the Windows VMs and only built by the build VMs.
+    push @FileNames, "../src/testagentd/TestAgentd.exe";
+  }
+  foreach my $FileName (@FileNames)
   {
     my $BaseName = basename($FileName);
     if ($FileName !~ m~^latest/~ and !$LogInfo->{$BaseName} and
-- 
2.30.2



More information about the wine-devel mailing list