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

[master] simplify prereq checks by using feature-test.c

Browse Source 
4498.	[test]		Simplify prerequisite checks in system tests.
			[RT #43516]
This commit is contained in:
Evan Hunt
2016-10-31 16:53:37 -07:00
parent ace79092b3
commit 5480a74b70
81 changed files with 165 additions and 3657 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
bin/tests/system/statistics/tests.sh
View File

@@ -116,7 +116,7 @@ n=`expr $n + 1`
ret=0
n=`expr $n + 1`
echo "I:checking that zones with slash are properly shown in XML output ($n)"
if $XMLSTATS && [ -x ${CURL} ] ; then
if $FEATURETEST --have-libxml2 && [ -x ${CURL} ] ; then
${CURL} http://10.53.0.1:8053/xml/v3/zones > curl.out.${t} 2>/dev/null || ret=1
grep '<zone name="32/1.0.0.127-in-addr.example" rdataclass="IN">' curl.out.${t} > /dev/null || ret=1
else
@@ -128,7 +128,7 @@ status=`expr $status + $ret`
ret=0
n=`expr $n + 1`
echo "I:checking that zones return their type ($n)"
if $XMLSTATS && [ -x ${CURL} ] ; then
if $FEATURETEST --have-libxml2 && [ -x ${CURL} ] ; then
${CURL} http://10.53.0.1:8053/xml/v3/zones > curl.out.${t} 2>/dev/null || ret=1
grep '<zone name="32/1.0.0.127-in-addr.example" rdataclass="IN"><type>master</type>' curl.out.${t} > /dev/null || ret=1
else