From: Mark Andrews Date: Thu, 29 May 2014 00:45:52 +0000 (+1000) Subject: make a explict edns query so this subtest is independent of other tests X-Git-Tag: v9.11.0a1~1597 X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=4694229f607b88eeaff8d9ccbbc900a5b9a2b93d;p=thirdparty%2Fbind9.git make a explict edns query so this subtest is independent of other tests --- diff --git a/bin/tests/system/resolver/tests.sh b/bin/tests/system/resolver/tests.sh index 324119b1426..f697adf3736 100755 --- a/bin/tests/system/resolver/tests.sh +++ b/bin/tests/system/resolver/tests.sh @@ -478,13 +478,13 @@ status=`expr $status + $ret` n=`expr $n + 1` echo "I:check that E was logged on EDNS queries in the query log (${n})" ret=0 -grep "query: fetchall.tld IN ANY +E" ns5/named.run > /dev/null || ret=1 +$DIG @10.53.0.5 -p 5300 +edns edns.fetchall.tld any > dig.out.2.${n} || ret=1 +grep "query: edns.fetchall.tld IN ANY +E" ns5/named.run > /dev/null || ret=1 $DIG @10.53.0.5 -p 5300 +noedns noedns.fetchall.tld any > dig.out.2.${n} || ret=1 grep "query: noedns.fetchall.tld IN ANY" ns5/named.run > /dev/null || ret=1 grep "query: noedns.fetchall.tld IN ANY +E" ns5/named.run > /dev/null && ret=1 if [ $ret != 0 ]; then echo "I:failed"; fi status=`expr $status + $ret` - echo "I:exit status: $status" exit $status