Skip to content

C
criu
Commit 0198590c authored by Pavel Emelyanov's avatar Pavel Emelyanov
Browse files
Options

zdtm: Factor out starting the test via Makefule 

Signed-off-by: 's avatarPavel Emelyanov <xemul@parallels.com>
parent 2fc83791
Show whitespace changes
Inline Side-by-side
Showing with 6 additions and 4 deletions
test/zdtm.sh
View file @ 0198590c
...@@ -368,7 +368,7 @@ start_test() ...@@ -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() ...@@ -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
......
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