Francois Gouget : testbot/WineRunTask: Don't force Windows VMs to have a c: \winetest directory.

[Alexandre Julliard]

Module: tools
Branch: master
Commit: 56ce6a39cc8808b75a8b6cfb52ea8158082fa8de
URL:    http://source.winehq.org/git/tools.git/?a=commit;h=56ce6a39cc8808b75a8b6cfb5...

Author: Francois Gouget 
Date:   Mon Dec 17 10:02:18 2012 +0100

testbot/WineRunTask: Don't force Windows VMs to have a c:\winetest directory.

---

testbot/bin/WineRunTask.pl |   12 +++++-------
 1 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl
index 8e7aeff..ccb2600 100755
--- a/testbot/bin/WineRunTask.pl
+++ b/testbot/bin/WineRunTask.pl
@@ -248,8 +248,7 @@ if ($FileType ne "exe32" && $FileType ne "exe64")
              $FullErrFileName, $Job, $Step, $Task;
 }
 my $FileName = $Step->FileName;
-$ErrMessage = $VM->CopyFileFromHostToGuest("$StepDir/$FileName",
-                                           "C:\winetest\$FileName");
+$ErrMessage = $VM->CopyFileFromHostToGuest("$StepDir/$FileName", $FileName);
 if (defined($ErrMessage))
 {
   FatalError "Can't copy exe to VM: $ErrMessage\n",
@@ -259,20 +258,20 @@ my $TestLauncher = "TestLauncher" .
                    ($FileType eq "exe64" ? "64" : "32") .
                    ".exe";
 $ErrMessage = $VM->CopyFileFromHostToGuest("$BinDir/windows/$TestLauncher",
-                                           "C:\winetest\$TestLauncher");
+                                           $TestLauncher);
 if (defined($ErrMessage))
 {
   FatalError "Can't copy TestLauncher to VM: $ErrMessage\n",
              $FullErrFileName, $Job, $Step, $Task;
 }
 $ErrMessage = $VM->CopyFileFromHostToGuest("$BinDir/windows/GenFixEnv.exe",
-                                           "C:\winetest\GenFixEnv.exe");
+                                           "GenFixEnv.exe");
 if (defined($ErrMessage))
 {
   FatalError "Can't copy GenFixEnv to VM: $ErrMessage\n",
              $FullErrFileName, $Job, $Step, $Task;
 }
-my $Script = "@echo off\r\ncd \winetest\r\nset WINETEST_DEBUG=" . $Step->DebugLevel .
+my $Script = "@echo off\r\nset WINETEST_DEBUG=" . $Step->DebugLevel .
              "\r\n";
 if ($Step->ReportSuccessfulTests)
 {
@@ -313,8 +312,7 @@ $Script .= "cls\r\n";

$ErrMessage = $VM->RunScriptInGuestTimeout($Script, $Task->Timeout + 15);
 my $LogErrMessage = RetrieveLogFile $Job, $Step, $Task,
-                                    "C:\winetest\$RptFileName",
-                                     $FullLogFileName;
+                                    $RptFileName, $FullLogFileName;
 TakeScreenshot $VM, $FullScreenshotFileName;
 if (defined($ErrMessage))
 {