[2/2] testbot/build: Log the Build.pl and Reconfig.pl scripts output.
Francois Gouget
fgouget at codeweavers.com
Mon Dec 17 03:01:41 CST 2012
This lets us capture Perl errors in case there is any.
---
testbot/bin/WineRunBuild.pl | 14 ++++++--------
testbot/bin/WineRunReconfig.pl | 4 +++-
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl
index faf777e..4cc7c89 100755
--- a/testbot/bin/WineRunBuild.pl
+++ b/testbot/bin/WineRunBuild.pl
@@ -243,14 +243,12 @@ if (defined($ErrMessage))
FatalError "Can't copy patch to VM: $ErrMessage\n",
$FullErrFileName, $Job, $Step, $Task;
}
-my $Script = "#!/bin/sh\n";
-$Script .= "../bin/build/Build.pl $FileName " . $Step->FileType .
- " $BaseName 32";
-if ($Run64)
-{
- $Script .= ",64";
-}
-$Script .= "\n";
+my $Script = "#!/bin/sh\n" .
+ "rm -f Build.log\n" .
+ "../bin/build/Build.pl $FileName " . $Step->FileType .
+ " $BaseName 32";
+$Script .= ",64"if ($Run64);
+$Script .= " >>Build.log 2>&1\n";
$ErrMessage = $VM->RunScriptInGuestTimeout($Script, $Task->Timeout);
if (defined($ErrMessage))
{
diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl
index 4f86e10..fa38a5f 100755
--- a/testbot/bin/WineRunReconfig.pl
+++ b/testbot/bin/WineRunReconfig.pl
@@ -198,7 +198,9 @@ if (defined($ErrMessage))
FatalError "Can't set VM status to running: $ErrMessage\n",
$FullErrFileName, $Job, $Step, $Task;
}
-my $Script = "#!/bin/sh\n../bin/build/Reconfig.pl\n";
+my $Script = "#!/bin/sh\n" .
+ "rm -f Reconfig.log\n" .
+ "../bin/build/Reconfig.pl >>Reconfig.log 2>&1\n";
$ErrMessage = $VM->RunScriptInGuestTimeout($Script, $Task->Timeout);
if (defined($ErrMessage))
{
--
1.7.10.4
More information about the wine-patches
mailing list