Francois Gouget : testbot/WineRunTask: Just die when killed.

Alexandre Julliard julliard at winehq.org
Wed Oct 31 13:40:50 CDT 2012


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

Author: Francois Gouget <fgouget at codeweavers.com>
Date:   Wed Oct 31 04:47:05 2012 +0100

testbot/WineRunTask: Just die when killed.

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 files changed, 0 insertions(+), 9 deletions(-)

diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl
index edcfd81..aedfed1 100755
--- a/testbot/bin/WineRunTask.pl
+++ b/testbot/bin/WineRunTask.pl
@@ -228,16 +228,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))
 {




More information about the wine-cvs mailing list