[Box Backup-commit] COMMIT r2209 - box/trunk/infrastructure

[boxbackup-dev@fluffy.co.uk]

Author: chris
Date: 2008-08-03 07:57:27 +0100 (Sun, 03 Aug 2008)
New Revision: 2209

Modified:
   box/trunk/infrastructure/makebuildenv.pl.in
Log:
Kill running daemons using kill -f on Windows (cygwin) which kills
by Windows PID.


Modified: box/trunk/infrastructure/makebuildenv.pl.in
===================================================================
--- box/trunk/infrastructure/makebuildenv.pl.in	2008-08-03 06:56:16 UTC (rev 2208)
+++ box/trunk/infrastructure/makebuildenv.pl.in	2008-08-03 06:57:27 UTC (rev 2209)
@@ -408,13 +408,27 @@
 				"test script file for $module for writing\n";
 			print TESTFILE "#!/bin/sh\necho TEST: $module\n";
 
-			if(-d "$module/testfiles")
+			if (-d "$module/testfiles")
 			{
+				if ($target_windows)
+				{
 				print TESTFILE <<__E;
 echo Killing any running daemons...
+test -r testfiles/bbackupd.pid && /bin/kill -f `cat testfiles/bbackupd.pid`
+test -r testfiles/bbstored.pid && /bin/kill -f `cat testfiles/bbstored.pid`
+__E
+			}
+			else
+			{
+				print TESTFILE <<__E;
+echo Killing any running daemons...
 test -r testfiles/bbackupd.pid && kill `cat testfiles/bbackupd.pid`
 test -r testfiles/bbstored.pid && kill `cat testfiles/bbstored.pid`
+__E
+			}
 
+
+			print TESTFILE <<__E;
 echo Removing old test files...
 chmod -R a+rwx testfiles
 rm -rf testfiles