From f9408a054e0796416f7f06897f79663f980ef7bb Mon Sep 17 00:00:00 2001 From: Kir Kolyshkin Date: Mon, 6 Feb 2012 22:07:19 +0400 Subject: [PATCH] test/zdtm.sh: kill the test case process if crtools failed Do not leave it running Signed-off-by: Kir Kolyshkin Signed-off-by: Andrey Vagin --- test/zdtm.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/test/zdtm.sh b/test/zdtm.sh index fe1bd5b2d..04f7589ba 100644 --- a/test/zdtm.sh +++ b/test/zdtm.sh @@ -51,6 +51,7 @@ run_test() local args=$* local tname=`basename $test` local tdir=`dirname $test` + local ret killall -9 $tname make -C $tdir cleanout $tname.pid @@ -62,12 +63,14 @@ run_test() echo Dump $pid 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 killall -9 $tname &> /dev/null || break echo Waiting... sleep 1 done + [ "$ret" -eq 0 ] || return 1 echo Restore $pid setsid $CRTOOLS restore -D $ddump -o restore.log -d -t $pid $args || return 2