diff options
author | Guy Harris <guy@alum.mit.edu> | 2018-01-08 16:38:10 -0800 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 2018-01-09 00:38:51 +0000 |
commit | af0f49e80dce20b50ca757b52c2454e137ce1c74 (patch) | |
tree | f4bdde99005a0d8374ebea72ff76f58b4c30073c /test | |
parent | 94479aded162aecce6289bdf26f95073bed0dc55 (diff) |
Use pcapng as the name of the file format.
At one point, I remember a discussion resulting in the official name of
the next-generation replacement for pcap format being changed to
"pcapng", with no hyphen.
Make Wireshark reflect that.
Change-Id: Ie66fb13a0fe3a8682143106dab601952e9154e2a
Reviewed-on: https://code.wireshark.org/review/25214
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'test')
-rw-r--r-- | test/lua/acme_file.lua | 6 | ||||
-rwxr-xr-x | test/suite-fileformats.sh | 24 |
2 files changed, 15 insertions, 15 deletions
diff --git a/test/lua/acme_file.lua b/test/lua/acme_file.lua index eefa67463b..2595d53fe4 100644 --- a/test/lua/acme_file.lua +++ b/test/lua/acme_file.lua @@ -416,9 +416,9 @@ function State:get_timestamp(line, file_position, seeking) -- XXX - but for purposes of testing, we just force the year to -- 2014, so that we can compare the result of this code reading - -- an Acme log with the result of the pcap-ng reader reading a - -- pcap-ng file with the same packets - the time stamps in - -- pcap-ng files are times since the Epoch, so the year is known + -- an Acme log with the result of the pcapng reader reading a + -- pcapng file with the same packets - the time stamps in + -- pcapng files are times since the Epoch, so the year is known self.tyear = 2014 end diff --git a/test/suite-fileformats.sh b/test/suite-fileformats.sh index 10a04794ee..19c7fc7b1f 100755 --- a/test/suite-fileformats.sh +++ b/test/suite-fileformats.sh @@ -71,52 +71,52 @@ ff_step_nsec_pcap_direct() { test_step_ok } -# Microsecond pcap-ng / stdin +# Microsecond pcapng / stdin ff_step_usec_pcapng_stdin() { $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 - test_step_failed "Output of microsecond pcap direct read vs microsecond pcap-ng via stdin differ" + test_step_failed "Output of microsecond pcap direct read vs microsecond pcapng via stdin differ" cat $DIFF_OUT return fi test_step_ok } -# Microsecond pcap-ng / direct +# Microsecond pcapng / direct ff_step_usec_pcapng_direct() { $TSHARK $TS_FF_ARGS -r "${CAPTURE_DIR}dhcp.pcapng" > ./ff-ts-usec-pcapng-direct.txt 2> /dev/null diff -u $FF_BASELINE ./ff-ts-usec-pcapng-direct.txt > $DIFF_OUT 2>&1 RETURNVALUE=$? if [ ! $RETURNVALUE -eq $EXIT_OK ]; then - test_step_failed "Output of microsecond pcap direct read vs microsecond pcap-ng direct read differ" + test_step_failed "Output of microsecond pcap direct read vs microsecond pcapng direct read differ" cat $DIFF_OUT return fi test_step_ok } -# Nanosecond pcap-ng / stdin +# Nanosecond pcapng / stdin ff_step_nsec_pcapng_stdin() { $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 - test_step_failed "Output of microsecond pcap direct read vs nanosecond pcap-ng via stdin differ" + test_step_failed "Output of microsecond pcap direct read vs nanosecond pcapng via stdin differ" cat $DIFF_OUT return fi test_step_ok } -# Nanosecond pcap-ng / direct +# Nanosecond pcapng / direct ff_step_nsec_pcapng_direct() { $TSHARK $TS_FF_ARGS -r "${CAPTURE_DIR}dhcp-nanosecond.pcapng" > ./ff-ts-nsec-pcapng-direct.txt 2> /dev/null diff -u $FF_BASELINE ./ff-ts-nsec-pcapng-direct.txt > $DIFF_OUT 2>&1 RETURNVALUE=$? if [ ! $RETURNVALUE -eq $EXIT_OK ]; then - test_step_failed "Output of microsecond pcap direct read vs nanosecond pcap-ng direct read differ" + test_step_failed "Output of microsecond pcap direct read vs nanosecond pcapng direct read differ" cat $DIFF_OUT return fi @@ -128,10 +128,10 @@ tshark_ff_suite() { test_step_add "Microsecond pcap via stdin" ff_step_usec_pcap_stdin test_step_add "Nanosecond pcap via stdin" ff_step_nsec_pcap_stdin test_step_add "Nanosecond pcap direct read" ff_step_nsec_pcap_direct - test_step_add "Microsecond pcap-ng via stdin" ff_step_usec_pcapng_stdin - test_step_add "Microsecond pcap-ng direct read" ff_step_usec_pcapng_direct - test_step_add "Nanosecond pcap-ng via stdin" ff_step_nsec_pcapng_stdin - test_step_add "Nanosecond pcap-ng direct read" ff_step_nsec_pcapng_direct + test_step_add "Microsecond pcapng via stdin" ff_step_usec_pcapng_stdin + test_step_add "Microsecond pcapng direct read" ff_step_usec_pcapng_direct + test_step_add "Nanosecond pcapng via stdin" ff_step_nsec_pcapng_stdin + test_step_add "Nanosecond pcapng direct read" ff_step_nsec_pcapng_direct } ff_cleanup_step() { |