[Box Backup-commit] COMMIT r1307 - box/chris/general/infrastructure

[boxbackup-dev@fluffy.co.uk]

Author: chris
Date: 2007-03-03 21:26:04 +0000 (Sat, 03 Mar 2007)
New Revision: 1307

Modified:
   box/chris/general/infrastructure/makebuildenv.pl.in
Log:
Try to kill any running daemons before and after each test.
(merged back from chris/merge)


Modified: box/chris/general/infrastructure/makebuildenv.pl.in
===================================================================
--- box/chris/general/infrastructure/makebuildenv.pl.in	2007-03-03 20:22:34 UTC (rev 1306)
+++ box/chris/general/infrastructure/makebuildenv.pl.in	2007-03-03 21:26:04 UTC (rev 1307)
@@ -401,31 +401,53 @@
 		sub writetestfile
 		{
 			my ($filename,$runcmd,$module) = @_;		
-			open TESTFILE,">$filename" or die "Can't open test script file for $module for writing\n";
+
+			open TESTFILE,">$filename" or die "Can't open " .
+				"test script file for $module for writing\n";
 			print TESTFILE "#!/bin/sh\necho TEST: $module\n";
+
 			if(-d "$module/testfiles")
 			{
 				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`
+
 echo Removing old test files...
 rm -rf testfiles
+
 echo Copying new test files...
 cp -p -R ../../../$module/testfiles .
+
 __E
 			}
+
 			if(-e "$module/testextra")
 			{
-				open FL,"$module/testextra" or die "Can't open $module/testextra";
+				open FL,"$module/testextra" or die 
+					"Can't open $module/testextra";
 				while(<FL>) {print TESTFILE}
 				close FL;
 			}
+
 			print TESTFILE "$runcmd\n";
+
+			if(-d "$module/testfiles")
+			{
+				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
+			}
+
 			close TESTFILE;
 		}
 		
-		writetestfile("$mod/_t", 
+		writetestfile("$mod/_t", "GLIBCXX_FORCE_NEW=1 ".
 			'./test' . $platform_exe_ext . ' $1 $2 $3 $4 $5', $mod);
-		writetestfile("$mod/_t-gdb", 
-			'gdb ./test' . $platform_exe_ext, $mod);
+		writetestfile("$mod/_t-gdb", "GLIBCXX_FORCE_NEW=1 ".
+			'gdb ./test' . $platform_exe_ext . ' $*', $mod);
 		
 	}