Commit c26a421a authored by Mark Andrews's avatar Mark Andrews
Browse files

check that delv -t any works

(cherry picked from commit 6999bee7)
parent 59554432
...@@ -517,7 +517,7 @@ else ...@@ -517,7 +517,7 @@ else
fi fi
# using delv insecure mode as not testing dnssec here # using delv insecure mode as not testing dnssec here
DELVOPTS="-i -p ${PORT}" DELVOPTS="+noroot +nodlv -p ${PORT}"
if [ -x ${DELV} ] ; then if [ -x ${DELV} ] ; then
n=`expr $n + 1` n=`expr $n + 1`
...@@ -721,13 +721,23 @@ if [ -x ${DELV} ] ; then ...@@ -721,13 +721,23 @@ if [ -x ${DELV} ] ; then
n=`expr $n + 1` n=`expr $n + 1`
echo_i "check that delv -q -m works ($n)" echo_i "check that delv -q -m works ($n)"
ret=0 ret=0
$DELV $DELVOPTS @10.53.0.3 -q -m > delv.out.test$n 2>&1 $DELV $DELVOPTS @10.53.0.3 -q -m > delv.out.test$n 2>&1 || ret=1
grep '^; -m\..*[0-9]*.*IN.*ANY.*;' delv.out.test$n > /dev/null || ret=1 grep '^; -m\..*[0-9]*.*IN.*ANY.*;' delv.out.test$n > /dev/null || ret=1
grep "^add " delv.out.test$n > /dev/null && ret=1 grep "^add " delv.out.test$n > /dev/null && ret=1
grep "^del " delv.out.test$n > /dev/null && ret=1 grep "^del " delv.out.test$n > /dev/null && ret=1
check_ttl_range delv.out.test$n '\\-ANY' 300 3 || ret=1 check_ttl_range delv.out.test$n '\\-ANY' 300 3 || ret=1
if [ $ret != 0 ]; then echo_i "failed"; fi if [ $ret != 0 ]; then echo_i "failed"; fi
status=`expr $status + $ret` status=`expr $status + $ret`
n=`expr $n + 1`
echo_i "check that delv -t ANY works ($n)"
ret=0
$DELV $DELVOPTS @10.53.0.3 -t ANY example > delv.out.test$n 2>&1 || ret=1
grep "^example." < delv.out.test$n > /dev/null || ret=1
check_ttl_range delv.out.test$n NS 300 || ret=1
check_ttl_range delv.out.test$n SOA 300 || ret=1
if [ $ret != 0 ]; then echo_i "failed"; fi
status=`expr $status + $ret`
else else
echo_i "$DELV is needed, so skipping these delv tests" echo_i "$DELV is needed, so skipping these delv tests"
fi fi
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment