testbot/WineRunTask: Just die when killed.

Francois Gouget fgouget at codeweavers.com
Tue Oct 30 22:47:05 CDT 2012


This script had a SIGTERM handler that tried to retrieve the task's log file. However this caused a deadlock because testagentd is single-client and WineRunTask still had another connection to it.
Anyway, this last ditch attempt to retrieve the log was questionable to begin with.
---
 testbot/bin/WineRunTask.pl |    9 ---------
 1 file changed, 9 deletions(-)

diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl
index ef9d78c..b101aff 100755
--- a/testbot/bin/WineRunTask.pl
+++ b/testbot/bin/WineRunTask.pl
@@ -227,16 +227,7 @@ my $FullLogFileName = "$TaskDir/log";
 my $FullErrFileName = "$TaskDir/err";
 my $FullScreenshotFileName = "$TaskDir/screenshot.png";
 
-sub TermHandler
-{
-  RetrieveLogFile $Job, $Step, $Task, "C:\\winetest\\$RptFileName",
-                  $FullLogFileName;
-  TakeScreenshot $VM, $FullScreenshotFileName;
-  FatalError "Cancelled\n", $FullErrFileName, $Job, $Step, $Task;
-}
-
 $VM->Status('running');
-$SIG{TERM} = \&TermHandler;
 my ($ErrProperty, $ErrMessage) = $VM->Save();
 if (defined($ErrMessage))
 {
-- 
1.7.10.4




More information about the wine-patches mailing list