diff options
| author | gerald <gerald@f5534014-38df-0310-8fa8-9805f1628bb7> | 2011-08-29 21:16:29 +0000 |
|---|---|---|
| committer | gerald <gerald@f5534014-38df-0310-8fa8-9805f1628bb7> | 2011-08-29 21:16:29 +0000 |
| commit | 18f0bae6b6cc3bbd6d612a2b00b7e1856121fd72 (patch) | |
| tree | d5d8668c1311730a9c53340a447783e5a02cf32b /test | |
| parent | 0f8675042b9f6080532497692d26188b1c6a51ac (diff) | |
Replace "-Q" with "WIRESHARK_QUIT_AFTER_CAPTURE" as discussed in bug 6256.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38784 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'test')
| -rwxr-xr-x | test/config.sh | 3 | ||||
| -rwxr-xr-x | test/suite-capture.sh | 5 |
2 files changed, 6 insertions, 2 deletions
diff --git a/test/config.sh b/test/config.sh index a0c0d0ea12..2fc5cfb839 100755 --- a/test/config.sh +++ b/test/config.sh @@ -80,6 +80,9 @@ if [ "$WS_SYSTEM" != "Windows" ] && which mkfifo &>/dev/null ; then TEST_FIFO=1 fi +# Tell Wireshark to quit after capuring packets. +export WIRESHARK_QUIT_AFTER_CAPTURE="True" + # Display our environment ##printf "\n ------- Info =-----------------\n" diff --git a/test/suite-capture.sh b/test/suite-capture.sh index 9cd2a4c410..8fab50b270 100755 --- a/test/suite-capture.sh +++ b/test/suite-capture.sh @@ -386,8 +386,9 @@ capture_step_snapshot() { } wireshark_capture_suite() { - # Q: quit after cap, k: start capture immediately - DUT="$WIRESHARK -Q -k" + # k: start capture immediately + # WIRESHARK_QUIT_AFTER_CAPTURE needs to be set. + DUT="$WIRESHARK -k" test_step_add "Capture 10 packets" capture_step_10packets # piping to stdout doesn't work with Wireshark and capturing! #test_step_add "Capture 10 packets using stdout: -w -" capture_step_10packets_stdout |