aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorUlf Lamping <ulf.lamping@web.de>2006-01-06 01:11:31 +0000
committerUlf Lamping <ulf.lamping@web.de>2006-01-06 01:11:31 +0000
commit72560c5d1d70bd5ae455af5a3d97c9521935e24e (patch)
treeaada3686712d013da9e2cb13e2b235ce7e272199 /test
parent0a37e62332399f8edcc5fc8e28653e12b7a3d28f (diff)
minor cleanup
svn path=/trunk/; revision=16964
Diffstat (limited to 'test')
-rw-r--r--test/suite-capture.sh7
1 files changed, 5 insertions, 2 deletions
diff --git a/test/suite-capture.sh b/test/suite-capture.sh
index edcd7c3942..b7a21e6495 100644
--- a/test/suite-capture.sh
+++ b/test/suite-capture.sh
@@ -65,8 +65,7 @@ capture_step_10packets() {
# capture exactly 10 packets using "-w -" (piping to stdout)
capture_step_10packets_stdout() {
- #$DUT -i $TRAFFIC_CAPTURE_IFACE -c 10 -a duration:$TRAFFIC_CAPTURE_DURATION -F libpcap -w ./testout.pcap 2>./testout.txt
- $DUT -i $TRAFFIC_CAPTURE_IFACE -c 10 -a duration:$TRAFFIC_CAPTURE_DURATION -F libpcap -w - > ./testout.pcap 2>./testout.txt
+ $DUT -i $TRAFFIC_CAPTURE_IFACE -c 10 -a duration:$TRAFFIC_CAPTURE_DURATION -w - > ./testout.pcap 2>./testout.txt
RETURNVALUE=$?
if [ ! $RETURNVALUE -eq $EXIT_OK ]; then
test_step_failed "exit status of $DUT: $RETURNVALUE"
@@ -190,6 +189,8 @@ ethereal_capture_suite() {
# Q: quit after cap, k: start capture immediately
DUT="$ETHEREAL -Q -k"
test_step_add "Capture 10 packets" capture_step_10packets
+ # piping to stdout doesn't work with Ethereal and capturing!
+ #test_step_add "Capture 10 packets using stdout: -w -" capture_step_10packets_stdout
# read filter doesn't work with Ethereal and capturing!
#test_step_add "Capture read filter (${TRAFFIC_CAPTURE_DURATION}s)" capture_step_read_filter
# the snapshot length test is also based on the read filters
@@ -208,6 +209,8 @@ dumpcap_capture_suite() {
#DUT="$DUMPCAP -Q"
DUT=$DUMPCAP
test_step_add "Capture 10 packets" capture_step_10packets
+ # piping to stdout currently doesn't work with dumpcap!
+ #test_step_add "Capture 10 packets using stdout: -w -" capture_step_10packets_stdout
# read filter doesn't work with dumpcap!
#test_step_add "Capture read filter (${TRAFFIC_CAPTURE_DURATION}s)" capture_step_read_filter
test_step_add "Capture snapshot length 68 bytes (${TRAFFIC_CAPTURE_DURATION}s)" capture_step_snapshot