Alexandre Julliard : testbot: Don't hardcode .exe.so extension.

[Alexandre Julliard]

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

Author: Alexandre Julliard <julliard(a)winehq.org>
Date:   Wed Apr 24 00:40:25 2019 +0200

testbot: Don't hardcode .exe.so extension.

Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 testbot/bin/build/WineTest.pl | 6 +++---
 testbot/lib/Build/Utils.pm    | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/testbot/bin/build/WineTest.pl b/testbot/bin/build/WineTest.pl
index 7e6b822..f848157 100755
--- a/testbot/bin/build/WineTest.pl
+++ b/testbot/bin/build/WineTest.pl
@@ -99,7 +99,7 @@ sub DailyWineTest($$$$)
   # Run WineTest. Ignore the exit code since it returns non-zero whenever
   # there are test failures.
   my $Tag = SanitizeTag("$BaseTag-$BaseName");
-  RunWine($Mission, "programs/winetest/winetest.exe.so",
+  RunWine($Mission, "winetest.exe",
           "-c -o '$DataDir/$BaseName.report' -t $Tag ". ShArgv2Cmd(@$Args));
   if (!-f "$DataDir/$BaseName.report")
   {
@@ -109,7 +109,7 @@ sub DailyWineTest($$$$)
 
   # Send the report to the website
   if ((!$NoSubmit and !$Mission->{nosubmit}) and
-      RunWine($Mission, "programs/winetest/winetest.exe.so",
+      RunWine($Mission, "winetest.exe",
               "-c -s '$DataDir/$BaseName.report'"))
   {
     LogMsg "WineTest failed to send the $BaseName report\n";
@@ -168,7 +168,7 @@ sub TestPatch($$)
 
   # Run WineTest. Ignore the exit code since it returns non-zero whenever
   # there are test failures.
-  RunWine($Mission, "programs/winetest/winetest.exe.so",
+  RunWine($Mission, "winetest.exe",
           "-c -o '$DataDir/$BaseName.report' -t do.not.submit ".
           join(" ", @TestList));
   if (!-f "$DataDir/$BaseName.report")
diff --git a/testbot/lib/Build/Utils.pm b/testbot/lib/Build/Utils.pm
index b204386..254c762 100644
--- a/testbot/lib/Build/Utils.pm
+++ b/testbot/lib/Build/Utils.pm
@@ -383,7 +383,7 @@ sub CreateWinePrefix($;$)
   rmtree($ENV{WINEPREFIX});
 
   # Crash dialogs cause delays so disable them
-  if (RunWine($Mission, "programs/reg/reg.exe.so", "ADD HKCU\\\\Software\\\\Wine\\\\WineDbg /v ShowCrashDialog /t REG_DWORD /d 0"))
+  if (RunWine($Mission, "reg.exe", "ADD HKCU\\\\Software\\\\Wine\\\\WineDbg /v ShowCrashDialog /t REG_DWORD /d 0"))
   {
     return "Failed to disable the crash dialogs: $!";
   }