[CRIU] [PATCH] Revert "zdtm.sh: dump traffic for *tcpbuf* tests"

Andrey Vagin avagin at openvz.org
Tue Aug 13 12:01:52 EDT 2013


This reverts commit 21d94e00866e34e518a3d8501f02f8a0a681a0b5.

This patch was created for investigating
https://bugzilla.openvz.org/show_bug.cgi?id=2676

The bug is fixed and this patch does nothing useful, because tcpdump
starts too late.

Signed-off-by: Andrey Vagin <avagin at openvz.org>
---
 test/zdtm.sh | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/test/zdtm.sh b/test/zdtm.sh
index 9a873ee..33c085a 100755
--- a/test/zdtm.sh
+++ b/test/zdtm.sh
@@ -166,7 +166,6 @@ EXCLUDE_PATTERN=""
 CLEANUP=0
 PAGE_SERVER=0
 PS_PORT=12345
-TCPDUMP_PID=
 COMPILE_ONLY=0
 
 check_criu()
@@ -218,9 +217,6 @@ exit_callback()
 	[[ -n "$ZDTM_FAILED" && -n "$DUMP_ARCHIVE" ]] && tar -czf $DUMP_ARCHIVE dump
 	[ -n "$TMPFS_DUMP" ] &&
 		umount -l "$TMPFS_DUMP"
-
-	[ -n "$TCPDUMP_PID" ] &&
-		kill $TCPDUMP_PID
 }
 trap exit_callback EXIT
 
@@ -393,11 +389,6 @@ EOF
 		args="-n uts -n ipc -n net -n pid -n mnt --root $ZDTM_ROOT --pidfile $TPID $args"
 	fi
 
-	echo $tname | grep -q tcpbuf && {
-		tcpdump -w dump/$tname/$PID/tcpdump.data -i lo &
-		TCPDUMP_PID=$!
-	}
-
 	for i in `seq $ITERATIONS`; do
 		local dump_only=
 		local postdump=
@@ -509,9 +500,6 @@ EOF
 		[ $sltime -lt 9 ] && sltime=$((sltime+1))
 	done
 
-	[ -n "$TCPDUMP_PID" ] && kill $TCPDUMP_PID
-	TCPDUMP_PID=""
-	
 	cat $test.out
 	cat $test.out | grep -q PASS || return 2
 	[ "$CLEANUP" -ne 0 ] && rm -rf `dirname $ddump`
-- 
1.8.3.1



More information about the CRIU mailing list