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 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

10
test/zdtm.sh
View File

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