From: Mark Andrews <marka@isc.org>
Date: Thu, 20 Apr 2017 07:59:45 +0000 (+1000)
Subject: fix 'minimal-any yes;' to force TCP / UDP
X-Git-Tag: v9.12.0a1~381
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=706c6ac5e232735060f95e3bbd64a9acd85d2f84;p=thirdparty%2Fbind9.git

fix 'minimal-any yes;' to force TCP / UDP
---

diff --git a/bin/tests/system/additional/tests.sh b/bin/tests/system/additional/tests.sh
index 178237a8bda..2855c3baf60 100644
--- a/bin/tests/system/additional/tests.sh
+++ b/bin/tests/system/additional/tests.sh
@@ -236,9 +236,27 @@ $RNDC -c ../common/rndc.conf -s 10.53.0.1 -p 9953 reconfig 2>&1 | sed 's/^/I:ns1
 sleep 2
 
 n=`expr $n + 1`
-echo "I:testing with 'minimal-any yes;' ($n)"
+echo "I:testing with 'minimal-any yes;' over UDP ($n)"
 ret=0
-$DIG -t ANY www.rt.example @10.53.0.1 -p 5300 > dig.out.$n || ret=1
+$DIG -t ANY +notcp www.rt.example @10.53.0.1 -p 5300 > dig.out.$n || ret=1
+grep "ANSWER: 1, AUTHORITY: 0, ADDITIONAL: 1" dig.out.$n > /dev/null || ret=1
+if [ $ret -eq 1 ] ; then
+    echo "I: failed"; status=1
+fi
+n=`expr $n + 1`
+
+echo "I:testing with 'minimal-any yes;' over TCP ($n)"
+ret=0
+$DIG -t ANY +tcp www.rt.example @10.53.0.1 -p 5300 > dig.out.$n || ret=1
+grep "ANSWER: 3, AUTHORITY: 0, ADDITIONAL: 1" dig.out.$n > /dev/null || ret=1
+if [ $ret -eq 1 ] ; then
+    echo "I: failed"; status=1
+fi
+
+n=`expr $n + 1`
+echo "I:testing with 'minimal-any yes;' over UDP ($n)"
+ret=0
+$DIG -t ANY +notcp www.rt.example @10.53.0.1 -p 5300 > dig.out.$n || ret=1
 grep "ANSWER: 1, AUTHORITY: 0, ADDITIONAL: 1" dig.out.$n > /dev/null || ret=1
 if [ $ret -eq 1 ] ; then
     echo "I: failed"; status=1