Assume we always have GNU diff and that we can use --strip-trailing-cr.

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

diff --git a/test/suite-io.sh b/test/suite-io.sh
index b6fe2bd6f8f5302138565e0a3929b18673751ff8..1c9dffd5727d506cfc1256453081897c9d406700 100755 (executable)
--- 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"