summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPetr Rockai <prockai@redhat.com>2014-10-01 11:53:24 +0200
committerPetr Rockai <prockai@redhat.com>2015-02-05 13:51:06 +0100
commit45e2aee8f9173cc2858da93a4bb9bc289a36bf9d (patch)
tree4511f1e2c121b4fbd9e6c8427425be1de2a69497
parent78ba413ed148f34a36e2e041947e66a681255d0d (diff)
downloadlvm2-45e2aee8f9173cc2858da93a4bb9bc289a36bf9d.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 3ef2da02e..9241fba45 100644
--- a/test/lib/aux.sh
+++ b/test/lib/aux.sh
@@ -214,7 +214,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