Try adding the fifo step to Wireshark. Clean up the order of tests.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37485 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/test/suite-capture.sh b/test/suite-capture.sh
index 5fe7983f3f1ea1f5e771e235b41003ed717a35fd..854979d8ce6a6756266be4d2ae65af55c12e6d0a 100755 (executable)
--- a/test/suite-capture.sh
+++ b/test/suite-capture.sh
@@ -384,10 +384,13 @@ wireshark_capture_suite() {
        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
+       if [ $TEST_FIFO ]; then
+               test_step_add "Capture via fifo" capture_step_fifo
+       fi
+       test_step_add "Capture via stdin" capture_step_stdin
        # read filter doesn't work with Wireshark and capturing!
        #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
-       test_step_add "Capture via stdin" capture_step_stdin
 }
 
 tshark_capture_suite() {