Commit 5b3d6577 authored by Andrey Vagin's avatar Andrey Vagin Committed by Pavel Emelyanov

Revert "zdtm.sh: dump traffic for *tcpbuf* tests"

This reverts commit 21d94e00.

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: 's avatarAndrey Vagin <avagin@openvz.org>
Signed-off-by: 's avatarPavel Emelyanov <xemul@parallels.com>
parent 4e6cd368
...@@ -156,7 +156,6 @@ EXCLUDE_PATTERN="" ...@@ -156,7 +156,6 @@ EXCLUDE_PATTERN=""
CLEANUP=0 CLEANUP=0
PAGE_SERVER=0 PAGE_SERVER=0
PS_PORT=12345 PS_PORT=12345
TCPDUMP_PID=
COMPILE_ONLY=0 COMPILE_ONLY=0
BATCH_TEST=0 BATCH_TEST=0
SPECIFIED_NAME_USED=0 SPECIFIED_NAME_USED=0
...@@ -210,9 +209,6 @@ exit_callback() ...@@ -210,9 +209,6 @@ exit_callback()
[[ -n "$ZDTM_FAILED" && -n "$DUMP_ARCHIVE" ]] && tar -czf $DUMP_ARCHIVE dump [[ -n "$ZDTM_FAILED" && -n "$DUMP_ARCHIVE" ]] && tar -czf $DUMP_ARCHIVE dump
[ -n "$TMPFS_DUMP" ] && [ -n "$TMPFS_DUMP" ] &&
umount -l "$TMPFS_DUMP" umount -l "$TMPFS_DUMP"
[ -n "$TCPDUMP_PID" ] &&
kill $TCPDUMP_PID
} }
trap exit_callback EXIT trap exit_callback EXIT
...@@ -385,11 +381,6 @@ EOF ...@@ -385,11 +381,6 @@ EOF
args="--root $ZDTM_ROOT --pidfile $TPID $args" args="--root $ZDTM_ROOT --pidfile $TPID $args"
fi fi
echo $tname | grep -q tcpbuf && {
tcpdump -w dump/$tname/$PID/tcpdump.data -i lo &
TCPDUMP_PID=$!
}
for i in `seq $ITERATIONS`; do for i in `seq $ITERATIONS`; do
local dump_only= local dump_only=
local postdump= local postdump=
...@@ -502,9 +493,6 @@ EOF ...@@ -502,9 +493,6 @@ EOF
[ $sltime -lt 9 ] && sltime=$((sltime+1)) [ $sltime -lt 9 ] && sltime=$((sltime+1))
done done
[ -n "$TCPDUMP_PID" ] && kill $TCPDUMP_PID
TCPDUMP_PID=""
cat $test.out cat $test.out
cat $test.out | grep -q PASS || return 2 cat $test.out | grep -q PASS || return 2
[ "$CLEANUP" -ne 0 ] && rm -rf `dirname $ddump` [ "$CLEANUP" -ne 0 ] && rm -rf `dirname $ddump`
......
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