Commit 77bdb182 authored by Andrey Vagin's avatar Andrey Vagin Committed by Pavel Emelyanov

zdtm: compare file descriptors only for static tests

For other tests set of file descriptors can be changed
Signed-off-by: 's avatarAndrey Vagin <avagin@openvz.org>
Signed-off-by: 's avatarPavel Emelyanov <xemul@parallels.com>
parent f639680b
...@@ -668,8 +668,10 @@ EOF ...@@ -668,8 +668,10 @@ EOF
[ -n "$dump_only" ] && cpt_args="$cpt_args $POSTDUMP" [ -n "$dump_only" ] && cpt_args="$cpt_args $POSTDUMP"
save_fds $PID $ddump/dump.fd expr $tname : "static" > /dev/null && {
save_maps $PID $ddump/dump.maps save_fds $PID $ddump/dump.fd
save_maps $PID $ddump/dump.maps
}
setsid $CRIU_CPT $dump_cmd -D $ddump -o dump.log -v4 -t $PID $gen_args $cpt_args setsid $CRIU_CPT $dump_cmd -D $ddump -o dump.log -v4 -t $PID $gen_args $cpt_args
retcode=$? retcode=$?
...@@ -701,11 +703,11 @@ EOF ...@@ -701,11 +703,11 @@ EOF
fi fi
if [ -n "$dump_only" ]; then if [ -n "$dump_only" ]; then
save_fds $PID $ddump/dump.fd.after
diff_fds $ddump/dump.fd $ddump/dump.fd.after || return 1
save_maps $PID $ddump/dump.maps.after
expr $tname : "static" > /dev/null && { expr $tname : "static" > /dev/null && {
save_fds $PID $ddump/dump.fd.after
diff_fds $ddump/dump.fd $ddump/dump.fd.after || return 1
save_maps $PID $ddump/dump.maps.after
diff_maps $ddump/dump.maps $ddump/dump.maps.after || return 1 diff_maps $ddump/dump.maps $ddump/dump.maps.after || return 1
} }
...@@ -739,11 +741,10 @@ EOF ...@@ -739,11 +741,10 @@ EOF
[ -n "$PIDNS" ] && PID=`cat $TPID` [ -n "$PIDNS" ] && PID=`cat $TPID`
save_fds $PID $ddump/restore.fd
diff_fds $ddump/dump.fd $ddump/restore.fd || return 2
save_maps $PID $ddump/restore.maps
expr $tname : "static" > /dev/null && { expr $tname : "static" > /dev/null && {
save_fds $PID $ddump/restore.fd
save_maps $PID $ddump/restore.maps
diff_fds $ddump/dump.fd $ddump/restore.fd || return 2
diff_maps $ddump/dump.maps $ddump/restore.maps || return 2 diff_maps $ddump/dump.maps $ddump/restore.maps || return 2
} }
fi fi
......
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