Mirrors/criu
1
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu.git synced 2026-07-26 03:25:30 +00:00
Code Issues Projects Releases Wiki Activity

zdtm: Factor out starting the test via Makefule

Browse source 
Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
This commit is contained in:
Pavel Emelyanov 2014-07-01 21:02:07 +04:00
parent 2fc837917f
commit 0198590c5a
1 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

16
test/zdtm.sh
View file

@ -368,7 +368,7 @@ start_test()
if [ -z "$PIDNS" ]; then
TPID="$test.pid"
make -C $tdir $tname.pid || return 1
unset ZDTM_NEWNS
else
TPID=$(readlink -f $tdir)/$tname.init.pid
if [ -z "$ZDTM_ROOT" ]; then
@ -378,17 +378,19 @@ start_test()
mount --bind . $ZDTM_ROOT || return 1
fi
construct_root $ZDTM_ROOT $tdir/$tname || return 1
( export ZDTM_NEWNS=1
export ZDTM_NEWNS=1
export ZDTM_PIDFILE=$TPID
cd $ZDTM_ROOT
rm -f $ZDTM_PIDFILE
if ! make -C $tdir $tname.pid; then
echo ERROR: fail to start $tdir/$tname
return 1
fi
)
fi
if ! make -C $tdir $tname.pid; then
echo ERROR: fail to start $tdir/$tname
return 1
fi
[ -z "$ZDTM_ROOT" ] || cd -
PID=`cat "$TPID"` || return 1
if ! ps -p $PID ; then
echo "Test failed to start"