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@icodeweavers.com --- Wine used to be able to find winetest.exe in the build tree but no longer (happened between f69c8f018188 and 12cfe6826773). This lets the TestBot run the tests on Wine VMs again but there is another issue with the WoW64 wineprefix creation. --- 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 dd41fcf67..498b8afde 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")