mir/criu
2
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu synced 2025-09-02 15:25:21 +00:00
Code Issues Releases Wiki Activity

zdtm: Factor out getting pid of test

Browse Source 
Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
This commit is contained in:
Pavel Emelyanov
2014-07-01 21:01:39 +04:00
parent 693bf79ffd
commit 8eb1d662bf
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
test/zdtm.sh
View File

@@ -353,7 +353,6 @@ start_test()
local tdir=$1 local tdir=$1
local tname=$2 local tname=$2
export ZDTM_ROOT export ZDTM_ROOT
TPID=`readlink -f $tdir`/$tname.init.pid
killall -9 $tname > /dev/null 2>&1 killall -9 $tname > /dev/null 2>&1
make -C $tdir $tname.cleanout make -C $tdir $tname.cleanout
@@ -368,9 +367,10 @@ start_test()
fi fi
if [ -z "$PIDNS" ]; then if [ -z "$PIDNS" ]; then
TPID="$test.pid"
make -C $tdir $tname.pid || return 1 make -C $tdir $tname.pid || return 1
PID=`cat $test.pid` || return 1
else else
TPID=$(readlink -f $tdir)/$tname.init.pid
if [ -z "$ZDTM_ROOT" ]; then if [ -z "$ZDTM_ROOT" ]; then
mkdir -p dump mkdir -p dump
ZDTM_ROOT=`mktemp -d /tmp/criu-root.XXXXXX` ZDTM_ROOT=`mktemp -d /tmp/criu-root.XXXXXX`
@@ -388,9 +388,12 @@ start_test()
return 1 return 1
fi fi
) )
fi
PID=`cat "$TPID"` PID=`cat "$TPID"` || return 1
ps -p $PID || return 1 if ! ps -p $PID ; then
echo "Test failed to start"
return 1
fi fi
} }
@@ -468,10 +471,6 @@ run_test()
fi fi
local ddump local ddump
if ! kill -s 0 "$PID"; then
echo "Got a wrong pid '$PID'"
return 1
fi
if [ -f "${test}.opts" ]; then if [ -f "${test}.opts" ]; then
gen_args="$gen_args $(cat "${test}.opts")" gen_args="$gen_args $(cat "${test}.opts")"