summaryrefslogtreecommitdiff
path: root/infrastructure
diff options
context:
space:
mode:
authorChris Wilson <chris+github@qwirx.com>2008-09-06 10:44:47 +0000
committerChris Wilson <chris+github@qwirx.com>2008-09-06 10:44:47 +0000
commit276d9fcc457daa657cd21585742cf30d6f8ab8c7 (patch)
treeeb2946274ca0203591cdd60a4041ead9f8a85e09 /infrastructure
parentacc05818ff65f5350557286f18884e23dadc80bb (diff)
Don't try to kill daemons if not running, avoid error messages.
Diffstat (limited to 'infrastructure')
-rwxr-xr-xinfrastructure/makebuildenv.pl.in11
1 files changed, 8 insertions, 3 deletions
diff --git a/infrastructure/makebuildenv.pl.in b/infrastructure/makebuildenv.pl.in
index 9daa67b7..3ceacb75 100755
--- a/infrastructure/makebuildenv.pl.in
+++ b/infrastructure/makebuildenv.pl.in
@@ -419,7 +419,6 @@ test -r testfiles/bbstored.pid && kill `cat testfiles/bbstored.pid`
__E
}
-
print TESTFILE <<__E;
echo Removing old test files...
chmod -R a+rwx testfiles
@@ -444,9 +443,15 @@ __E
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`
+test -r testfiles/bbackupd.pid \\
+&& kill -0 `cat testfiles/bbackupd.pid` \\
+&& kill `cat testfiles/bbackupd.pid`
+
+test -r testfiles/bbstored.pid \\
+&& kill -0 `cat testfiles/bbstored.pid` \\
+&& kill `cat testfiles/bbstored.pid`
__E
}