[CRIU] [PATCH] test: check descriptors and maps for static tests

Andrey Vagin avagin at openvz.org
Thu Feb 12 10:24:48 PST 2015


tname doesn't contain a test type.

Reported-by: Pavel Emelyanov <xemul at parallels.com>
Signed-off-by: Andrey Vagin <avagin at openvz.org>
---
 test/zdtm.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/zdtm.sh b/test/zdtm.sh
index d78029a..6969791 100755
--- a/test/zdtm.sh
+++ b/test/zdtm.sh
@@ -737,7 +737,7 @@ EOF
 
 		[ -n "$dump_only" ] && cpt_args="$cpt_args $POSTDUMP"
 
-		expr $tname : "static" > /dev/null && {
+		expr $tdir : ".*static$" > /dev/null && {
 			save_fds $PID  $ddump/dump.fd
 			save_maps $PID  $ddump/dump.maps
 		}
@@ -772,7 +772,7 @@ EOF
 		fi
 
 		if [ -n "$dump_only" ]; then
-			expr $tname : "static" > /dev/null && {
+			expr $tdir : ".*static$" > /dev/null && {
 				save_fds $PID  $ddump/dump.fd.after
 				diff_fds $ddump/dump.fd $ddump/dump.fd.after || return 1
 
@@ -810,7 +810,7 @@ EOF
 
 			[ -n "$PIDNS" ] && PID=`cat $TPID`
 
-			expr $tname : "static" > /dev/null && {
+			expr $tdir : ".*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
-- 
1.9.3



More information about the CRIU mailing list