Commit 3d14c71c authored by Pavel Emelyanov's avatar Pavel Emelyanov

zdtm: Rename $args into $gen_args

Signed-off-by: 's avatarPavel Emelyanov <xemul@parallels.com>
parent 3b71200c
...@@ -459,7 +459,7 @@ run_test() ...@@ -459,7 +459,7 @@ run_test()
test=${ZP}/${test#ns/} test=${ZP}/${test#ns/}
shift shift
local args=$* local gen_args=$*
local tname=`basename $test` local tname=`basename $test`
local tdir=`dirname $test` local tdir=`dirname $test`
DUMP_PATH="" DUMP_PATH=""
...@@ -494,20 +494,20 @@ to ip is written in \$CR_IP_TOOL. ...@@ -494,20 +494,20 @@ to ip is written in \$CR_IP_TOOL.
EOF EOF
exit 1 exit 1
fi fi
args="--root $ZDTM_ROOT --pidfile $TPID $args" gen_args="--root $ZDTM_ROOT --pidfile $TPID $gen_args"
fi fi
if [ $tname = "rtc" ]; then if [ $tname = "rtc" ]; then
args="$args -L `pwd`/$tdir/lib" gen_args="$gen_args -L `pwd`/$tdir/lib"
fi fi
if [ -n "$AUTO_DEDUP" ]; then if [ -n "$AUTO_DEDUP" ]; then
args="$args --auto-dedup" gen_args="$gen_args --auto-dedup"
ps_args="--auto-dedup" ps_args="--auto-dedup"
fi fi
if echo $tname | fgrep -q 'irmap'; then if echo $tname | fgrep -q 'irmap'; then
args="$args --force-irmap" gen_args="$gen_args --force-irmap"
fi fi
for i in `seq $ITERATIONS`; do for i in `seq $ITERATIONS`; do
...@@ -546,7 +546,7 @@ EOF ...@@ -546,7 +546,7 @@ EOF
save_fds $PID $ddump/dump.fd save_fds $PID $ddump/dump.fd
save_maps $PID $ddump/dump.maps save_maps $PID $ddump/dump.maps
setsid $CRIU_CPT $dump_cmd $opts --file-locks --tcp-established $linkremap \ setsid $CRIU_CPT $dump_cmd $opts --file-locks --tcp-established $linkremap \
-x --evasive-devices -D $ddump -o dump.log -v4 -t $PID $args $snapopt $postdump -x --evasive-devices -D $ddump -o dump.log -v4 -t $PID $gen_args $snapopt $postdump
retcode=$? retcode=$?
# #
...@@ -604,7 +604,7 @@ EOF ...@@ -604,7 +604,7 @@ EOF
done done
echo Restore echo Restore
setsid $CRIU restore --file-locks --tcp-established -x -D $ddump -o restore.log -v4 -d $args || return 2 setsid $CRIU restore --file-locks --tcp-established -x -D $ddump -o restore.log -v4 -d $gen_args || return 2
[ -n "$PIDNS" ] && PID=`cat $TPID` [ -n "$PIDNS" ] && PID=`cat $TPID`
for i in `seq 5`; do for i in `seq 5`; do
......
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