Francois Gouget : testbot/WineTest: Pass the full path to winetest.exe.

[Alexandre Julliard]

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

Author: Francois Gouget <fgouget at codeweavers.com>
Date:   Fri Mar 26 13:05:38 2021 +0100

testbot/WineTest: Pass the full path to winetest.exe.

It is not installed in the wineprefix and thus is not in %PATH%.
So Wine needs its full path to find it.

Signed-off-by: Francois Gouget <fgouget at icodeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 testbot/bin/build/WineTest.pl | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/testbot/bin/build/WineTest.pl b/testbot/bin/build/WineTest.pl
index dd41fcf..498b8af 100755
--- a/testbot/bin/build/WineTest.pl
+++ b/testbot/bin/build/WineTest.pl
@@ -86,7 +86,8 @@ sub WineTestSuite($$$$)
   # there are test failures.
   my $BaseName = SetupTest("WineTest", $Mission);
   my $Tag = SanitizeTag("$BaseTag-$BaseName");
-  RunWine($Mission, "winetest.exe",
+  my $WineDir = GetWineDir($Mission);
+  RunWine($Mission, "$WineDir/programs/winetest/winetest.exe",
           "-c -o '$DataDir/$BaseName.report' -t $Tag ". ShArgv2Cmd(@$Args));
   if (!-f "$DataDir/$BaseName.report")
   {
@@ -96,7 +97,7 @@ sub WineTestSuite($$$$)
 
   # Send the report to the website
   if ((!$NoSubmit and !$Mission->{nosubmit}) and
-      RunWine($Mission, "winetest.exe",
+      RunWine($Mission, "$WineDir/programs/winetest/winetest.exe",
               "-c -s '$DataDir/$BaseName.report'"))
   {
     LogMsg "WineTest failed to send the $BaseName report\n";
@@ -142,7 +143,8 @@ sub TestPatch($$)
   # Run WineTest. Ignore the exit code since it returns non-zero whenever
   # there are test failures.
   my $BaseName = SetupTest("the tests", $Mission);
-  RunWine($Mission, "winetest.exe",
+  my $WineDir = GetWineDir($Mission);
+  RunWine($Mission, "$WineDir/programs/winetest/winetest.exe",
           "-c -o '$DataDir/$BaseName.report' -t do.not.submit ".
           join(" ", @TestList));
   if (!-f "$DataDir/$BaseName.report")