summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPetr Rockai <prockai@redhat.com>2014-10-01 11:53:24 +0200
committerPetr Rockai <prockai@redhat.com>2014-11-18 19:02:11 +0100
commitf729e0c74f9fd111e8862c30dce313e2bc1249e1 (patch)
tree469a713a86603168d7b606dcb82b010a0d096182
parent138025ae3fdfe2fbf0154a34193cbac0d4d54911 (diff)
downloadlvm2-f729e0c74f9fd111e8862c30dce313e2bc1249e1.tar.gz
test: It is not an error for a test daemon to exit before teardown.
-rw-r--r--test/lib/aux.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/test/lib/aux.sh b/test/lib/aux.sh
index 03d69ba59..290065a42 100644
--- a/test/lib/aux.sh
+++ b/test/lib/aux.sh
@@ -213,7 +213,7 @@ kill_sleep_kill_() {
slow=$2
if test -s $pidfile ; then
pid=$(< $pidfile)
- kill -TERM $pid
+ kill -TERM $pid || return 0
if test $slow -eq 0 ; then sleep .1 ; else sleep 1 ; fi
kill -KILL $pid 2>/dev/null || true
wait=0