diff options
| author | Guy Harris <guy@alum.mit.edu> | 2016-08-08 19:13:11 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2016-08-09 02:14:28 +0000 |
| commit | 8a141febc849c36dc40d4da2a39318f8f8856091 (patch) | |
| tree | ef71c1ee795d1797ea62a21a79b54a88ee5ec41a /test | |
| parent | 5cfb33fd6f68e8d2b8539a3d07a065fd9d79bf22 (diff) | |
| download | wireshark-8a141febc849c36dc40d4da2a39318f8f8856091.tar.gz wireshark-8a141febc849c36dc40d4da2a39318f8f8856091.tar.bz2 wireshark-8a141febc849c36dc40d4da2a39318f8f8856091.zip | |
Use -r rather than -i for the "via stdin" tests.
TShark, at least when running in one-pass mode, now supports reading
from the standard input if the file format is one that *can* be read
purely sequentially; both pcap and pcapng can be read purely
sequentially (unlike, for example, Microsoft Network Monitor format,
where you have to read the frame table, at the end of the file, before
you can read the frames, meaning you have to seek backwards, which you
can't do on a pipe).
Using -r 1) tests the "read from standard input" path, which we should
do in versions that support it, and 2) means we can check whether, for
the crashes we're seeing on 32-bit Windows 8.1, it's a problem with
reading from the standard input in general, or just a problem with
*capturing* from the standard input.
Change-Id: I67da34de43f47dd8c63fa2f2072be41148cfe5a7
Reviewed-on: https://code.wireshark.org/review/16968
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'test')
| -rwxr-xr-x | test/suite-fileformats.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/test/suite-fileformats.sh b/test/suite-fileformats.sh index 155c99a9b2..bf78a2d22e 100755 --- a/test/suite-fileformats.sh +++ b/test/suite-fileformats.sh @@ -34,7 +34,7 @@ DIFF_OUT=./diff-output.txt # Microsecond pcap / stdin ff_step_usec_pcap_stdin() { - $TSHARK $TS_FF_ARGS -i - < "${CAPTURE_DIR}dhcp.pcap" > ./ff-ts-usec-pcap-stdin.txt 2> /dev/null + $TSHARK $TS_FF_ARGS -r - < "${CAPTURE_DIR}dhcp.pcap" > ./ff-ts-usec-pcap-stdin.txt 2> /dev/null diff -u $FF_BASELINE ./ff-ts-usec-pcap-stdin.txt > $DIFF_OUT 2>&1 RETURNVALUE=$? if [ ! $RETURNVALUE -eq $EXIT_OK ]; then @@ -47,7 +47,7 @@ ff_step_usec_pcap_stdin() { # Nanosecond pcap / stdin ff_step_nsec_pcap_stdin() { - $TSHARK $TS_FF_ARGS -i - < "${CAPTURE_DIR}dhcp-nanosecond.pcap" > ./ff-ts-nsec-pcap-stdin.txt 2> /dev/null + $TSHARK $TS_FF_ARGS -r - < "${CAPTURE_DIR}dhcp-nanosecond.pcap" > ./ff-ts-nsec-pcap-stdin.txt 2> /dev/null diff -u $FF_BASELINE ./ff-ts-nsec-pcap-stdin.txt > $DIFF_OUT 2>&1 RETURNVALUE=$? if [ ! $RETURNVALUE -eq $EXIT_OK ]; then @@ -73,7 +73,7 @@ ff_step_nsec_pcap_direct() { # Microsecond pcap-ng / stdin ff_step_usec_pcapng_stdin() { - $TSHARK $TS_FF_ARGS -i - < "${CAPTURE_DIR}dhcp.pcapng" > ./ff-ts-usec-pcapng-stdin.txt 2> /dev/null + $TSHARK $TS_FF_ARGS -r - < "${CAPTURE_DIR}dhcp.pcapng" > ./ff-ts-usec-pcapng-stdin.txt 2> /dev/null diff -u $FF_BASELINE ./ff-ts-usec-pcapng-stdin.txt > $DIFF_OUT 2>&1 RETURNVALUE=$? if [ ! $RETURNVALUE -eq $EXIT_OK ]; then @@ -99,7 +99,7 @@ ff_step_usec_pcapng_direct() { # Nanosecond pcap-ng / stdin ff_step_nsec_pcapng_stdin() { - $TSHARK $TS_FF_ARGS -i - < "${CAPTURE_DIR}dhcp-nanosecond.pcapng" > ./ff-ts-nsec-pcapng-stdin.txt 2> /dev/null + $TSHARK $TS_FF_ARGS -r - < "${CAPTURE_DIR}dhcp-nanosecond.pcapng" > ./ff-ts-nsec-pcapng-stdin.txt 2> /dev/null diff -u $FF_BASELINE ./ff-ts-nsec-pcapng-stdin.txt > $DIFF_OUT 2>&1 RETURNVALUE=$? if [ ! $RETURNVALUE -eq $EXIT_OK ]; then |