From: Curtis Blackburn <ckb@isc.org>
Date: Fri, 22 May 2015 18:42:59 +0000 (-0700)
Subject: 4125.   [test]          Added tests for dig, renamed delv test to digdelv.
X-Git-Tag: v9.11.0a1~787
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=717c2b9655b371473683ef1c12f4b955e42cdb25;p=thirdparty%2Fbind9.git

4125.   [test]          Added tests for dig, renamed delv test to digdelv.
                        [RT #39490]
---

diff --git a/bin/tests/system/conf.sh.in b/bin/tests/system/conf.sh.in
index d0f6bbcf172..98116b59e7d 100644
--- a/bin/tests/system/conf.sh.in
+++ b/bin/tests/system/conf.sh.in
@@ -66,7 +66,7 @@ RANDFILE=$TOP/bin/tests/system/random.data
 # v6synth
 SUBDIRS="acl additional allow_query addzone autosign builtin
 	 cacheclean case checkconf @CHECKDS@ checknames checkzone
-	 @COVERAGE@ database delv dlv dlvauto dlz dlzexternal dname
+	 @COVERAGE@ database digdelv dlv dlvauto dlz dlzexternal dname
 	 dns64 dnssec dsdigest dscp ecdsa ednscompliance emptyzones
 	 filter-aaaa formerr forward geoip glue gost ixfr inline
 	 legacy limits logfileconfig lwresd
diff --git a/bin/tests/system/delv/clean.sh b/bin/tests/system/digdelv/clean.sh
similarity index 97%
rename from bin/tests/system/delv/clean.sh
rename to bin/tests/system/digdelv/clean.sh
index 47b0a3df95e..2db0acface4 100644
--- a/bin/tests/system/delv/clean.sh
+++ b/bin/tests/system/digdelv/clean.sh
@@ -14,6 +14,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
+rm -f dig.out.test*
 rm -f delv.out.test*
 rm -f */named.memstats
 rm -f */named.run
diff --git a/bin/tests/system/delv/ns1/named.conf b/bin/tests/system/digdelv/ns1/named.conf
similarity index 100%
rename from bin/tests/system/delv/ns1/named.conf
rename to bin/tests/system/digdelv/ns1/named.conf
diff --git a/bin/tests/system/delv/ns1/root.db b/bin/tests/system/digdelv/ns1/root.db
similarity index 100%
rename from bin/tests/system/delv/ns1/root.db
rename to bin/tests/system/digdelv/ns1/root.db
diff --git a/bin/tests/system/delv/ns2/example.db b/bin/tests/system/digdelv/ns2/example.db
similarity index 100%
rename from bin/tests/system/delv/ns2/example.db
rename to bin/tests/system/digdelv/ns2/example.db
diff --git a/bin/tests/system/delv/ns2/named.conf b/bin/tests/system/digdelv/ns2/named.conf
similarity index 100%
rename from bin/tests/system/delv/ns2/named.conf
rename to bin/tests/system/digdelv/ns2/named.conf
diff --git a/bin/tests/system/delv/ns3/named.conf b/bin/tests/system/digdelv/ns3/named.conf
similarity index 100%
rename from bin/tests/system/delv/ns3/named.conf
rename to bin/tests/system/digdelv/ns3/named.conf
diff --git a/bin/tests/system/delv/tests.sh b/bin/tests/system/digdelv/tests.sh
similarity index 69%
rename from bin/tests/system/delv/tests.sh
rename to bin/tests/system/digdelv/tests.sh
index 5492efd829a..751c12f910c 100644
--- a/bin/tests/system/delv/tests.sh
+++ b/bin/tests/system/digdelv/tests.sh
@@ -17,6 +17,47 @@ SYSTEMTESTTOP=..
 
 status=0
 n=0
+# using dig insecure mode as not testing dnssec here
+DIGOPTS="-i -p 5300"
+
+if [ -x ${DIG} ] ; then
+  n=`expr $n + 1`
+  echo "I:checking dig short form works ($n)"
+  ret=0
+  $DIG $DIGOPTS @10.53.0.3 +short a a.example > dig.out.test$n || ret=1
+  if test `wc -l < dig.out.test$n` != 1 ; then ret=1 ; fi
+  if [ $ret != 0 ]; then echo "I:failed"; fi 
+  status=`expr $status + $ret`
+
+  n=`expr $n + 1`
+  echo "I:checking dig split width works ($n)"
+  ret=0
+  $DIG $DIGOPTS @10.53.0.3 +split=4 -t sshfp foo.example > dig.out.test$n || ret=1
+  grep " 9ABC DEF6 7890 " < dig.out.test$n > /dev/null || ret=1
+  if [ $ret != 0 ]; then echo "I:failed"; fi 
+  status=`expr $status + $ret`
+
+  n=`expr $n + 1`
+  echo "I:checking dig with reverse lookup works ($n)"
+  ret=0
+  $DIG $DIGOPTS @10.53.0.3 -x 127.0.0.1 > dig.out.test$n 2>&1 || ret=1
+  # doesn't matter if has answer
+  grep -i "127\.in-addr\.arpa\." < dig.out.test$n > /dev/null || ret=1
+  if [ $ret != 0 ]; then echo "I:failed"; fi 
+  status=`expr $status + $ret`
+
+  n=`expr $n + 1`
+  echo "I:checking dig over TCP works ($n)"
+  ret=0
+  $DIG $DIGOPTS +tcp @10.53.0.3 a a.example > dig.out.test$n || ret=1
+  grep "10\.0\.0\.1$" < dig.out.test$n > /dev/null || ret=1
+  if [ $ret != 0 ]; then echo "I:failed"; fi
+  status=`expr $status + $ret`
+
+else
+  echo "$DIG is needed, so skipping these dig tests"
+fi
+
 # using delv insecure mode as not testing dnssec here
 DELVOPTS="-i -p 5300"