Francois Gouget : testbot/WineRunBuild: Sidestep issues arising from patch files containing bad characters.

[Alexandre Julliard]

Module: tools
Branch: master
Commit: 92b9c277eff9546542a6d5c35251ba3fca68d573
URL:    http://source.winehq.org/git/tools.git/?a=commit;h=92b9c277eff9546542a6d5c35...

Author: Francois Gouget <fgouget(a)codeweavers.com>
Date:   Fri Aug  8 02:58:06 2014 +0200

testbot/WineRunBuild: Sidestep issues arising from patch files containing bad characters.

---

 testbot/bin/WineRunBuild.pl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl
index ba6bb53..91244ad 100755
--- a/testbot/bin/WineRunBuild.pl
+++ b/testbot/bin/WineRunBuild.pl
@@ -288,7 +288,7 @@ my $ErrMessage;
 my $FileName = $Step->FileName;
 my $TA = $VM->GetAgent();
 Debug(Elapsed($Start), " Sending '$StepDir/$FileName'\n");
-if (!$TA->SendFile("$StepDir/$FileName", "staging/$FileName", 0))
+if (!$TA->SendFile("$StepDir/$FileName", "staging/patch.diff", 0))
 {
   $ErrMessage = $TA->GetLastError();
   FatalError "Could not copy the patch to the VM: $ErrMessage\n",
@@ -296,7 +296,7 @@ if (!$TA->SendFile("$StepDir/$FileName", "staging/$FileName", 0))
 }
 my $Script = "#!/bin/sh\n" .
              "rm -f Build.log\n" .
-             "../bin/build/Build.pl $FileName " . $Step->FileType .
+             "../bin/build/Build.pl patch.diff " . $Step->FileType .
              " $BaseName 32";
 $Script .= ",64"if ($Run64);
 $Script .= " >>Build.log 2>&1\n";