Francois Gouget : testbot/windows: Move the Windows binaries to bin/windows .

[Alexandre Julliard]

Module: tools
Branch: master
Commit: 149963d89f2cd18112b489894d6d8055cebe79f9
URL:    http://source.winehq.org/git/tools.git/?a=commit;h=149963d89f2cd18112b489894...

Author: Francois Gouget 
Date:   Tue Sep  4 00:12:21 2012 +0200

testbot/windows: Move the Windows binaries to bin/windows.

They are not meant to be run on the server so this cleans up the bin directory.

---

testbot/bin/WineRunTask.pl                   |    4 ++--
 testbot/bin/{ => windows}/GenFixEnv.exe      |  Bin 7680 -> 7680 bytes
 testbot/bin/{ => windows}/TestLauncher32.exe |  Bin 432844 -> 432844 bytes
 testbot/bin/{ => windows}/TestLauncher64.exe |  Bin 115348 -> 115348 bytes
 testbot/src/GenFixEnv/Makefile               |    2 +-
 testbot/src/TestLauncher/Makefile            |    2 +-
 6 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl
index 6db920c..836dab2 100755
--- a/testbot/bin/WineRunTask.pl
+++ b/testbot/bin/WineRunTask.pl
@@ -264,14 +264,14 @@ if (defined($ErrMessage))
 my $TestLauncher = "TestLauncher" . 
                    ($FileType eq "exe64" ? "64" : "32") .
                    ".exe";
-$ErrMessage = $VM->CopyFileFromHostToGuest("$BinDir/$TestLauncher",
+$ErrMessage = $VM->CopyFileFromHostToGuest("$BinDir/windows/$TestLauncher",
                                            "C:\winetest\$TestLauncher");
 if (defined($ErrMessage))
 {
   FatalError "Can't copy TestLauncher to VM: $ErrMessage\n",
              $FullErrFileName, $Job, $Step, $Task;
 }
-$ErrMessage = $VM->CopyFileFromHostToGuest("$BinDir/GenFixEnv.exe",
+$ErrMessage = $VM->CopyFileFromHostToGuest("$BinDir/windows/GenFixEnv.exe",
                                            "C:\winetest\GenFixEnv.exe");
 if (defined($ErrMessage))
 {
diff --git a/testbot/bin/GenFixEnv.exe b/testbot/bin/windows/GenFixEnv.exe
similarity index 100%
rename from testbot/bin/GenFixEnv.exe
rename to testbot/bin/windows/GenFixEnv.exe
diff --git a/testbot/bin/TestLauncher32.exe b/testbot/bin/windows/TestLauncher32.exe
similarity index 100%
rename from testbot/bin/TestLauncher32.exe
rename to testbot/bin/windows/TestLauncher32.exe
diff --git a/testbot/bin/TestLauncher64.exe b/testbot/bin/windows/TestLauncher64.exe
similarity index 100%
rename from testbot/bin/TestLauncher64.exe
rename to testbot/bin/windows/TestLauncher64.exe
diff --git a/testbot/src/GenFixEnv/Makefile b/testbot/src/GenFixEnv/Makefile
index c80a5c3..30c34b9 100644
--- a/testbot/src/GenFixEnv/Makefile
+++ b/testbot/src/GenFixEnv/Makefile
@@ -1,4 +1,4 @@
-bindir = ../../bin
+bindir = ../../bin/windows

CROSSCC32    = i686-w64-mingw32-gcc
 CROSSSTRIP32 = i686-w64-mingw32-strip
diff --git a/testbot/src/TestLauncher/Makefile b/testbot/src/TestLauncher/Makefile
index 822aef7..2b1dfaa 100644
--- a/testbot/src/TestLauncher/Makefile
+++ b/testbot/src/TestLauncher/Makefile
@@ -1,4 +1,4 @@
-bindir = ../../bin
+bindir = ../../bin/windows

CROSSCC32    = i686-w64-mingw32-gcc
 CROSSSTRIP32 = i686-w64-mingw32-strip