Commit f9408a05 authored by Kir Kolyshkin's avatar Kir Kolyshkin Committed by Andrey Vagin

test/zdtm.sh: kill the test case process if crtools failed

Do not leave it running
Signed-off-by: 's avatarKir Kolyshkin <kir@openvz.org>
Signed-off-by: 's avatarAndrey Vagin <avagin@gmail.com>
parent 6f5cf13f
...@@ -51,6 +51,7 @@ run_test() ...@@ -51,6 +51,7 @@ run_test()
local args=$* local args=$*
local tname=`basename $test` local tname=`basename $test`
local tdir=`dirname $test` local tdir=`dirname $test`
local ret
killall -9 $tname killall -9 $tname
make -C $tdir cleanout $tname.pid make -C $tdir cleanout $tname.pid
...@@ -62,12 +63,14 @@ run_test() ...@@ -62,12 +63,14 @@ run_test()
echo Dump $pid echo Dump $pid
mkdir -p $ddump mkdir -p $ddump
setsid $CRTOOLS dump -D $ddump -o dump.log -t $pid $args || return 1 setsid $CRTOOLS dump -D $ddump -o dump.log -t $pid $args
ret=$?
while :; do while :; do
killall -9 $tname &> /dev/null || break killall -9 $tname &> /dev/null || break
echo Waiting... echo Waiting...
sleep 1 sleep 1
done done
[ "$ret" -eq 0 ] || return 1
echo Restore $pid echo Restore $pid
setsid $CRTOOLS restore -D $ddump -o restore.log -d -t $pid $args || return 2 setsid $CRTOOLS restore -D $ddump -o restore.log -d -t $pid $args || return 2
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment