diff --git a/bin/tests/system/forward/tests.sh b/bin/tests/system/forward/tests.sh index 8fd22fc837..5a63e06e86 100644 --- a/bin/tests/system/forward/tests.sh +++ b/bin/tests/system/forward/tests.sh @@ -142,7 +142,7 @@ echo "//" | $SENDCMD # resolution. $DIG $DIGOPTS txt.example7. txt @$f1 > dig.out.f1 || ret=1 # The forwarder for the "example7" zone should only be queried once. -sent=`sed -n '/sending packet to 10.53.0.6/,/^$/p' ns3/named.run | grep ";txt.example7.*IN.*TXT" | wc -l` +sent=`tr -d '\r' < ns3/named.run | sed -n '/sending packet to 10.53.0.6/,/^$/p' | grep ";txt.example7.*IN.*TXT" | wc -l` if [ $sent -ne 1 ]; then ret=1; fi if [ $ret != 0 ]; then echo_i "failed"; fi status=`expr $status + $ret` @@ -150,7 +150,7 @@ status=`expr $status + $ret` echo_i "checking that priming queries are not forwarded" ret=0 $DIG $DIGOPTS +noadd +noauth txt.example1. txt @10.53.0.7 > dig.out.f7 || ret=1 -sent=`sed -n '/sending packet to 10.53.0.1/,/^$/p' ns7/named.run | grep ";.*IN.*NS" | wc -l` +sent=`tr -d '\r' < ns7/named.run | sed -n '/sending packet to 10.53.0.1/,/^$/p' | grep ";.*IN.*NS" | wc -l` [ $sent -eq 1 ] || ret=1 sent=`grep "10.53.0.7#.* (.): query '\./NS/IN' approved" ns4/named.run | wc -l` [ $sent -eq 0 ] || ret=1