Francois Gouget : testbot/WineRunBuild: Use the new Build.pl parameters and paths.

[Alexandre Julliard]

Module: tools
Branch: master
Commit: 56b8799f7b0bae53091e9cff04a5b1aaa831a8e2
URL:    https://source.winehq.org/git/tools.git/?a=commit;h=56b8799f7b0bae53091e9cff...

Author: Francois Gouget 
Date:   Thu Aug 23 22:58:12 2018 +0200

testbot/WineRunBuild: Use the new Build.pl parameters and paths.

Signed-off-by: Francois Gouget 
Signed-off-by: Alexandre Julliard

---

testbot/bin/WineRunBuild.pl | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl
index cca96b9..117b065 100755
--- a/testbot/bin/WineRunBuild.pl
+++ b/testbot/bin/WineRunBuild.pl
@@ -339,14 +339,14 @@ if ($Step->FileType ne "patch")
 # Figure out what to build
 #

-my (%Bitnesses, %TestExes);
+my (%Builds, %TestExes);
 foreach my $TestStep (@{$Job->Steps->GetItems()})
 {
   if (($TestStep->PreviousNo || 0) == $Step->No and
-      $TestStep->FileType =~ /^exe([0-9]+)$/)
+      $TestStep->FileType =~ /^exe/)
   {
-    $Bitnesses{$1} = 1;
-    $TestExes{$TestStep->FileName} = 1;
+    $Builds{$TestStep->FileType} = 1;
+    $TestExes{$TestStep->FileName} = $TestStep->FileType;
   }
 }

@@ -364,7 +364,7 @@ if (!$TA->SendFile($FileName, "staging/patch.diff", 0))
 }
 my $Script = "#!/bin/sh\n".
              "( set -x\n".
-             "  ../bin/build/Build.pl patch.diff ". join(":", sort keys %Bitnesses) ."\n".
+             "  ../bin/build/Build.pl patch.diff ". join(":", sort keys %Builds) ."\n".
              ") >Build.log 2>&1\n";
 Debug(Elapsed($Start), " Sending the script: [$Script]\n");
 if (!$TA->SendFileFromString($Script, "task", $TestAgent::SENDFILE_EXE))
@@ -455,9 +455,10 @@ foreach my $TestInfo (values %{$Impacts->{Tests}})
     my $Local = "$TestInfo->{ExeBase}$Bits.exe";
     next if (!$TestExes{$Local});

-    my $Remote = "build-mingw". ($Bits || "32") ."/$TestInfo->{Path}/$TestInfo->{ExeBase}.exe";
     Debug(Elapsed($Start), " Retrieving '$Local'\n");
-    if ($TA->GetFile($Remote, "$StepDir/$Local"))
+    my $BuildDir = "wine-$TestExes{$Local}";
+    if ($TA->GetFile("$BuildDir/$TestInfo->{Path}/$TestInfo->{ExeBase}.exe",
+                     "$StepDir/$Local"))
     {
       chmod 0664, "$StepDir/$Local";
     }