shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-03-10 16:58:47 +03:00
Code Releases Activity

test: Make killing local (test) daemons more robust.

Browse Source
This commit is contained in:
Petr Rockai 2014-10-01 08:53:27 +02:00
parent 17575403d4
commit 210a66fbf8
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
test/lib/aux.sh
View File

@ -210,11 +210,18 @@ teardown_devs() {
}
kill_sleep_kill_() {
if test -s "$1" ; then
if kill -TERM "$(< $1)" ; then
if test "$2" -eq 0 ; then sleep .1 ; else sleep 1 ; fi
kill -KILL "$(< $1)" 2>/dev/null || true
fi
pidfile=$1
slow=$2
if test -s $pidfile ; then
pid=$(< $pidfile)
kill -TERM $pid
if test $slow -eq 0 ; then sleep .1 ; else sleep 1 ; fi
kill -KILL $pid 2>/dev/null || true
wait=0
while ps $pid > /dev/null && test $wait -le 10; do
sleep .5
wait=$(($wait + 1))
done
fi
}

2
test/lib/utils.sh
View File

@ -112,7 +112,7 @@ STACKTRACE() {
test "${LVM_TEST_PARALLEL:-0}" -eq 1 -o -n "$RUNNING_DMEVENTD" -o -f LOCAL_DMEVENTD || {
pgrep dmeventd &>/dev/null && \
die "** During test dmeventd has been started!"
die "ERROR: The test started dmeventd unexpectedly."
}
# Get backtraces from coredumps