From: Evan Hunt Date: Tue, 15 Dec 2015 23:01:58 +0000 (-0800) Subject: [master] reclimit test was broken with v6 X-Git-Tag: v9.11.0a1~254 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0321aa184e03874aea4fff427987587e4b0e2d5a;p=thirdparty%2Fbind9.git [master] reclimit test was broken with v6 --- diff --git a/bin/tests/system/reclimit/tests.sh b/bin/tests/system/reclimit/tests.sh index 50f9b16ff0d..a9f7776cb62 100644 --- a/bin/tests/system/reclimit/tests.sh +++ b/bin/tests/system/reclimit/tests.sh @@ -31,7 +31,7 @@ $DIG $DIGOPTS @10.53.0.3 indirect1.example.org > dig.out.1.test$n || ret=1 grep "status: SERVFAIL" dig.out.1.test$n > /dev/null || ret=1 $DIG $DIGOPTS +short @10.53.0.2 count txt > dig.out.2.test$n || ret=1 eval count=`cat dig.out.2.test$n` -if $TESTSOCK6 != false +if [ "$TESTSOCK6" != "false" ] then [ $count -eq 26 ] || { ret=1; echo "I: count ($count) != 26"; } else @@ -50,7 +50,7 @@ $DIG $DIGOPTS @10.53.0.3 indirect2.example.org > dig.out.1.test$n || ret=1 grep "status: NOERROR" dig.out.1.test$n > /dev/null || ret=1 $DIG $DIGOPTS +short @10.53.0.2 count txt > dig.out.2.test$n || ret=1 eval count=`cat dig.out.2.test$n` -if $TESTSOCK6 != false +if [ "$TESTSOCK6" != "false" ] then [ $count -eq 49 ] || { ret=1; echo "I: count ($count) != 49"; } else @@ -74,7 +74,7 @@ $DIG $DIGOPTS @10.53.0.3 indirect3.example.org > dig.out.1.test$n || ret=1 grep "status: SERVFAIL" dig.out.1.test$n > /dev/null || ret=1 $DIG $DIGOPTS +short @10.53.0.2 count txt > dig.out.2.test$n || ret=1 eval count=`cat dig.out.2.test$n` -if $TESTSOCK6 != false +if [ "$TESTSOCK6" != "false" ] then [ $count -eq 12 ] || { ret=1; echo "I: count ($count) != 12"; } else @@ -93,7 +93,7 @@ $DIG $DIGOPTS @10.53.0.3 indirect4.example.org > dig.out.1.test$n || ret=1 grep "status: NOERROR" dig.out.1.test$n > /dev/null || ret=1 $DIG $DIGOPTS +short @10.53.0.2 count txt > dig.out.2.test$n || ret=1 eval count=`cat dig.out.2.test$n` -if $TESTSOCK6 != false +if [ "$TESTSOCK6" != "false" ] then [ $count -eq 21 ] || { ret=1; echo "I: count ($count) != 21"; } else @@ -114,7 +114,7 @@ echo "13" > ans2/ans.limit $RNDC -c ../common/rndc.conf -s 10.53.0.3 -p 9953 flush 2>&1 | sed 's/^/I:ns1 /' $DIG $DIGOPTS @10.53.0.2 reset > /dev/null || ret=1 $DIG $DIGOPTS @10.53.0.3 indirect5.example.org > dig.out.1.test$n || ret=1 -if $TESTSOCK6 != false +if [ "$TESTSOCK6" != "false" ] then grep "status: SERVFAIL" dig.out.1.test$n > /dev/null || ret=1 fi @@ -150,7 +150,7 @@ echo "10" > ans2/ans.limit $RNDC -c ../common/rndc.conf -s 10.53.0.3 -p 9953 flush 2>&1 | sed 's/^/I:ns1 /' $DIG $DIGOPTS @10.53.0.2 reset > /dev/null || ret=1 $DIG $DIGOPTS @10.53.0.3 indirect7.example.org > dig.out.1.test$n || ret=1 -if $TESTSOCK6 != false +if [ "$TESTSOCK6" != "false" ] then grep "status: SERVFAIL" dig.out.1.test$n > /dev/null || ret=1 fi