diff options
| author | Gerald Combs <gerald@wireshark.org> | 2013-08-23 21:17:56 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2013-08-23 21:17:56 +0000 |
| commit | fe0b28463f3249edf182e548e25424cb36fcc182 (patch) | |
| tree | 330040c53e3844c60ed64b4990f2ed7c3689f658 /test | |
| parent | c3d291754b238846a806ab1a308d6b91dab98eca (diff) | |
Assume we always have GNU diff and that we can use --strip-trailing-cr.
svn path=/trunk/; revision=51496
Diffstat (limited to 'test')
| -rwxr-xr-x | test/suite-io.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/suite-io.sh b/test/suite-io.sh index b6fe2bd6f8..1c9dffd572 100755 --- a/test/suite-io.sh +++ b/test/suite-io.sh @@ -134,7 +134,7 @@ io_step_rawshark_pcap_stdin() { return fi tail -c +25 "${CAPTURE_DIR}dhcp.pcap" | $RAWSHARK -dencap:1 -R "udp.port==68" -nr - > $IO_RAWSHARK_DHCP_PCAP_TESTOUT 2> /dev/null - diff -u $IO_RAWSHARK_DHCP_PCAP_BASELINE $IO_RAWSHARK_DHCP_PCAP_TESTOUT > $DIFF_OUT 2>&1 + diff -u --strip-trailing-cr $IO_RAWSHARK_DHCP_PCAP_BASELINE $IO_RAWSHARK_DHCP_PCAP_TESTOUT > $DIFF_OUT 2>&1 RETURNVALUE=$? if [ ! $RETURNVALUE -eq $EXIT_OK ]; then test_step_failed "Output of rawshark read pcap via stdin differs from baseline" |