ComputerSurge/bind9
3
0
Fork 0
Code Pull Requests 1 Activity

perform a more complete cleanup after running system tests [rt41255]

Browse Source 
(cherry picked from commit ecfedec0e0)

Conflicts:
	bin/tests/system/acl/clean.sh
	bin/tests/system/addzone/clean.sh
	bin/tests/system/allow_query/clean.sh
	bin/tests/system/autosign/clean.sh
	bin/tests/system/case/clean.sh
	bin/tests/system/checknames/clean.sh
	bin/tests/system/dlzexternal/clean.sh
	bin/tests/system/dscp/clean.sh
	bin/tests/system/ednscompliance/clean.sh
	bin/tests/system/emptyzones/clean.sh
	bin/tests/system/formerr/clean.sh
	bin/tests/system/forward/clean.sh
	bin/tests/system/glue/clean.sh
	bin/tests/system/limits/clean.sh
	bin/tests/system/lwresd/clean.sh
	bin/tests/system/masterfile/clean.sh
	bin/tests/system/names/clean.sh
	bin/tests/system/nslookup/clean.sh
	bin/tests/system/nsupdate/clean.sh
	bin/tests/system/sfcache/clean.sh
	bin/tests/system/sit/clean.sh
	bin/tests/system/sortlist/clean.sh
	bin/tests/system/stub/clean.sh
	bin/tests/system/xferquota/clean.sh

(cherry picked from commit f9c9fce5c7)

Conflicts:
	bin/tests/system/digdelv/tests.sh
	bin/tests/system/dlzexternal/clean.sh
	bin/tests/system/formerr/clean.sh
	bin/tests/system/resolver/clean.sh
	bin/tests/system/rndc/clean.sh
	bin/tests/system/rrl/prereq.sh
	bin/tests/system/sit/clean.sh
	bin/tests/system/tkey/clean.sh
	bin/tests/system/zonechecks/clean.sh
	lib/export/isc/nothreads/include/Makefile.in
This commit is contained in:
Mark Andrews
2015-12-16 11:29:18 +11:00
parent 565e69abd6
commit 71eafb2cb8
49 changed files with 194 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

85
bin/tests/system/digdelv/tests.sh
View File

@@ -128,6 +128,91 @@ if [ -x ${DIG} ] ; then
# if [ $ret != 0 ]; then echo "I:failed"; fi
# status=`expr $status + $ret`
# echo "I:checking dig +ttlunits works ($n)"
# ret=0
# $DIG $DIGOPTS +tcp @10.53.0.2 +ttlunits A weeks.example > dig.out.test$n || ret=1
# grep "^weeks.example. 3w" < dig.out.test$n > /dev/null || ret=1
# $DIG $DIGOPTS +tcp @10.53.0.2 +ttlunits A days.example > dig.out.test$n || ret=1
# grep "^days.example. 3d" < dig.out.test$n > /dev/null || ret=1
# $DIG $DIGOPTS +tcp @10.53.0.2 +ttlunits A hours.example > dig.out.test$n || ret=1
# grep "^hours.example. 3h" < dig.out.test$n > /dev/null || ret=1
# $DIG $DIGOPTS +tcp @10.53.0.2 +ttlunits A minutes.example > dig.out.test$n || ret=1
# grep "^minutes.example. 45m" < dig.out.test$n > /dev/null || ret=1
# $DIG $DIGOPTS +tcp @10.53.0.2 +ttlunits A seconds.example > dig.out.test$n || ret=1
# grep "^seconds.example. 45s" < 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 respects precedence of options with +ttlunits ($n)"
# ret=0
# $DIG $DIGOPTS +tcp @10.53.0.2 +ttlunits +nottlid A weeks.example > dig.out.test$n || ret=1
# grep "^weeks.example. IN" < dig.out.test$n > /dev/null || ret=1
# $DIG $DIGOPTS +tcp @10.53.0.2 +nottlid +ttlunits A weeks.example > dig.out.test$n || ret=1
# grep "^weeks.example. 3w" < dig.out.test$n > /dev/null || ret=1
# $DIG $DIGOPTS +tcp @10.53.0.2 +nottlid +nottlunits A weeks.example > dig.out.test$n || ret=1
# grep "^weeks.example. 1814400" < 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 -6 -4 ($n)"
ret=0
$DIG $DIGOPTS +tcp @10.53.0.2 -4 -6 A a.example > dig.out.test$n 2>&1 && ret=1
grep "only one of -4 and -6 allowed" < 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 @IPv6addr -4 A a.example ($n)"
if $TESTSOCK6 fd92:7065:b8e:ffff::2
then
ret=0
$DIG $DIGOPTS +tcp @fd92:7065:b8e:ffff::2 -4 A a.example > dig.out.test$n 2>&1 && ret=1
grep "address family not supported" < dig.out.test$n > /dev/null || ret=1
if [ $ret != 0 ]; then echo "I:failed"; fi
status=`expr $status + $ret`
else
echo "I:IPv6 unavailable; skipping"
fi
n=`expr $n + 1`
echo "I:checking dig @IPv4addr -6 A a.example ($n)"
if $TESTSOCK6 fd92:7065:b8e:ffff::2
then
ret=0
$DIG $DIGOPTS +tcp @10.53.0.2 -6 A a.example > dig.out.test$n 2>&1 || ret=1
grep "SERVER: ::ffff:10.53.0.2#5300" < dig.out.test$n > /dev/null || ret=1
if [ $ret != 0 ]; then echo "I:failed"; fi
status=`expr $status + $ret`
else
echo "I:IPv6 unavailable; skipping"
fi
# n=`expr $n + 1`
# echo "I:checking dig +subnet ($n)"
# ret=0
# $DIG $DIGOPTS +tcp @10.53.0.2 +subnet=127.0.0.1 A a.example > dig.out.test$n 2>&1 || ret=1
# grep "CLIENT-SUBNET: 127.0.0.1/32/0" < 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 +sp works as an abbriviated form of split ($n)"
ret=0
$DIG $DIGOPTS @10.53.0.3 +sp=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 -c works ($n)"
ret=0
$DIG $DIGOPTS @10.53.0.3 -c CHAOS -t txt version.bind > dig.out.test$n || ret=1
grep "version.bind. 0 CH TXT" < 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