Module: tools Branch: master Commit: b80df9cda4ff5b27fe8378373189ab4e41aab18f URL: https://source.winehq.org/git/tools.git/?a=commit;h=b80df9cda4ff5b27fe837837...
Author: Francois Gouget fgouget@codeweavers.com Date: Mon Feb 14 16:57:44 2022 +0100
testbot/WineRunReconfig: Only the build VMs produce TestAgentd.
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@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
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 9bd9429..0c39228 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