aboutsummaryrefslogtreecommitdiffstats
path: root/test/suite-capture.sh
diff options
context:
space:
mode:
authorBill Meier <wmeier@newsguy.com>2006-12-22 04:46:26 +0000
committerBill Meier <wmeier@newsguy.com>2006-12-22 04:46:26 +0000
commit98393c2355e2993e11d71065cfa4856dfa912e04 (patch)
tree9880990215354779dc707f95fc549dec85eef064 /test/suite-capture.sh
parent42d5c2906ffb803ad08d4fe1ba488141ff1c9bff (diff)
Add additional output to try to find out why the "capture 10
packets" test fails during the run-tests step of the buildbot windows build ... svn path=/trunk/; revision=20191
Diffstat (limited to 'test/suite-capture.sh')
-rw-r--r--test/suite-capture.sh17
1 files changed, 12 insertions, 5 deletions
diff --git a/test/suite-capture.sh b/test/suite-capture.sh
index b8d80c04df..c210d94417 100644
--- a/test/suite-capture.sh
+++ b/test/suite-capture.sh
@@ -32,7 +32,8 @@ EXIT_ERROR=2
traffic_gen_ping() {
# Generate some traffic for quiet networks.
# This will have to be adjusted for non-Windows systems.
- ping -n 20 www.wireshark.org > /dev/null 2>&1 &
+## ping -n 20 www.wireshark.org > /dev/null 2>&1 &
+ ping -n 20 www.wireshark.org > ./pingout.txt 2>&1 &
}
# capture exactly 10 packets
@@ -51,10 +52,15 @@ capture_step_10packets() {
> ./testout.txt 2>&1
RETURNVALUE=$?
if [ ! $RETURNVALUE -eq $EXIT_OK ]; then
- test_step_failed "exit status of $DUT: $RETURNVALUE"
+ wait # for ping to complete
+ echo
+ cat ./testout.txt
+ echo
+ cat ./pingout.txt
# part of the Prerequisite checks
- # probably wrong interface, output the possible interfaces
+ # wrong interface ? output the possible interfaces
$TSHARK -D
+ test_step_failed "exit status of $DUT: $RETURNVALUE"
return
fi
@@ -95,8 +101,8 @@ capture_step_10packets_stdout() {
> ./testout.pcap 2>./testout.txt
RETURNVALUE=$?
if [ ! $RETURNVALUE -eq $EXIT_OK ]; then
- test_step_failed "exit status of $DUT: $RETURNVALUE"
$TSHARK -D
+ test_step_failed "exit status of $DUT: $RETURNVALUE"
return
fi
@@ -170,10 +176,10 @@ capture_step_2multi_10packets() {
RETURNVALUE=$?
if [ ! $RETURNVALUE -eq $EXIT_OK ]; then
- test_step_failed "exit status of $DUT: $RETURNVALUE"
# part of the Prerequisite checks
# probably wrong interface, output the possible interfaces
$TSHARK -D
+ test_step_failed "exit status of $DUT: $RETURNVALUE"
return
fi
@@ -321,6 +327,7 @@ capture_cleanup_step() {
rm -f ./testout2.txt
rm -f ./testout.pcap
rm -f ./testout2.pcap
+ rm -f ./pingout.txt
}
capture_suite() {