Francois Gouget : testbot/bin: Fix some log and error messages.
Alexandre Julliard
julliard at winehq.org
Wed Aug 29 14:55:24 CDT 2012
Module: tools
Branch: master
Commit: 1b803b237bbc843167864f66b124681e526ab04d
URL: http://source.winehq.org/git/tools.git/?a=commit;h=1b803b237bbc843167864f66b124681e526ab04d
Author: Francois Gouget <fgouget at codeweavers.com>
Date: Wed Aug 29 18:34:33 2012 +0200
testbot/bin: Fix some log and error messages.
Always mention the name of the script issuing the log messages.
---
testbot/bin/Engine.pl | 2 +-
testbot/bin/RetrievePatches.pl | 6 +++---
testbot/bin/WineRunBuild.pl | 2 +-
testbot/bin/WineSendLog.pl | 12 ++++++------
4 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl
index f63344b..9b57ae6 100755
--- a/testbot/bin/Engine.pl
+++ b/testbot/bin/Engine.pl
@@ -463,7 +463,7 @@ sub HandleGetScreenshot
return "0$ErrMessage";
}
- return "1" . $ImageBytes;;
+ return "1" . $ImageBytes;
}
sub HandleClientCmd
diff --git a/testbot/bin/RetrievePatches.pl b/testbot/bin/RetrievePatches.pl
index 132b9f4..c0f17c8 100755
--- a/testbot/bin/RetrievePatches.pl
+++ b/testbot/bin/RetrievePatches.pl
@@ -47,7 +47,7 @@ if ($StartPatchId =~ m/^(\d+)$/)
}
else
{
- die "Invalid StartPatchId $StartPatchId";
+ die "RetrievePatches: Invalid StartPatchId $StartPatchId";
}
if ($EndPatchId =~ m/^(\d+)$/)
{
@@ -55,11 +55,11 @@ if ($EndPatchId =~ m/^(\d+)$/)
}
else
{
- die "Invalid EndPatchId $EndPatchId";
+ die "RetrievePatches: Invalid EndPatchId $EndPatchId";
}
if ($EndPatchId < $StartPatchId)
{
- die "EndPatchId $EndPatchId shouldn't be smaller than StartPatchId $StartPatchId";
+ die "RetrievePatches: EndPatchId $EndPatchId shouldn't be smaller than StartPatchId $StartPatchId";
}
my $BaseURL = "http://source.winehq.org/patches/data";
diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl
index eff4709..d11d4bf 100755
--- a/testbot/bin/WineRunBuild.pl
+++ b/testbot/bin/WineRunBuild.pl
@@ -234,7 +234,7 @@ $ErrMessage = $VM->CopyFileFromHostToGuest("$StepDir/$FileName",
"$DataDir/staging/$FileName");
if (defined($ErrMessage))
{
- FatalError "Can't copy exe to VM: $ErrMessage\n",
+ FatalError "Can't copy patch to VM: $ErrMessage\n",
$FullErrFileName, $Job, $Step, $Task;
}
my $Script = "#!/bin/sh\n";
diff --git a/testbot/bin/WineSendLog.pl b/testbot/bin/WineSendLog.pl
index 34d8378..1f92083 100755
--- a/testbot/bin/WineSendLog.pl
+++ b/testbot/bin/WineSendLog.pl
@@ -40,7 +40,7 @@ sub FatalError
my $JobKey = defined($Job) ? $Job->GetKey() : "0";
- LogMsg "SendLog: $JobKey $ErrMessage";
+ LogMsg "WineSendLog: $JobKey $ErrMessage";
exit 1;
}
@@ -124,7 +124,7 @@ sub ReadLog
}
else
{
- LogMsg "SendLog: Unable to open log $LogName\n";
+ LogMsg "WineSendLog: Unable to open log $LogName\n";
}
return \@Messages;
@@ -400,7 +400,7 @@ EOF
}
else
{
- LogMsg "SendLog: BotFailure found in ${LatestName}.err\n";
+ LogMsg "WineSendLog: BotFailure found in ${LatestName}.err\n";
}
if ($MessagesFromErr || $MessagesFromLog)
{
@@ -410,7 +410,7 @@ EOF
}
elsif ($BotFailure)
{
- LogMsg "SendLog: BotFailure found in $TaskDir/err\n";
+ LogMsg "WineSendLog: BotFailure found in $TaskDir/err\n";
}
}
@@ -509,7 +509,7 @@ delete $ENV{ENV};
my $JobId = $ARGV[0];
if (! $JobId)
{
- die "Usage: SendLog.pl JobId";
+ die "Usage: WineSendLog.pl JobId";
}
# Untaint parameters
@@ -531,6 +531,6 @@ if (! defined($Job))
SendLog($Job);
-LogMsg "SendLog: log for job $JobId sent\n";
+LogMsg "WineSendLog: log for job $JobId sent\n";
exit;
More information about the wine-cvs
mailing list