From: Mark Andrews <marka@isc.org>
Date: Tue, 30 Jan 2018 23:05:40 +0000 (+1100)
Subject: handle different eol coventions
X-Git-Tag: v9.13.0~203
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=a2c693ab3b06d47c092e00bce0ab0c9b381da36c;p=thirdparty%2Fbind9.git

handle different eol coventions
---

diff --git a/bin/tests/system/keepalive/tests.sh b/bin/tests/system/keepalive/tests.sh
index 148ef3296db..448ed470b33 100644
--- a/bin/tests/system/keepalive/tests.sh
+++ b/bin/tests/system/keepalive/tests.sh
@@ -66,7 +66,7 @@ echo "I:checking re-configured value ($n)"
 ret=0
 n=`expr $n + 1`
 $RNDCCMD tcp-timeouts 300 300 300 200 > output
-diff output expected || ret=1
+diff -b output expected || ret=1
 $DIG +vc +keepalive foo.example @10.53.0.2 -p 5300 > dig.out.test$n
 grep "; TCP KEEPALIVE: 20.0 secs" dig.out.test$n > /dev/null || ret=1
 if [ $ret != 0 ]; then echo "I:failed"; fi