From fe0b28463f3249edf182e548e25424cb36fcc182 Mon Sep 17 00:00:00 2001
From: Gerald Combs <gerald@wireshark.org>
Date: Fri, 23 Aug 2013 21:17:56 +0000
Subject: Assume we always have GNU diff and that we can use
 --strip-trailing-cr.

svn path=/trunk/; revision=51496
---
 test/suite-io.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'test')

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"
-- 
cgit v1.2.1