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

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

Browse Source 
4498.	[test]		Simplify prerequisite checks in system tests.
			[RT #43516]

(cherry picked from commit 5480a74b70)
(cherry picked from commit 45fd95544c)
(cherry picked from commit 6e09e18400)
This commit is contained in:
Evan Hunt
2016-11-01 13:10:07 -07:00
parent 61a01f4860
commit 1b8d070f9a
38 changed files with 83 additions and 749 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -14,8 +14,6 @@
# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE.
# $Id: tests.sh,v 1.1.4.11 2012/02/01 16:54:32 each Exp $
SYSTEMTESTTOP=..
. $SYSTEMTESTTOP/conf.sh
@@ -29,8 +27,8 @@ t=0
ret=0
t=`expr $t + 1`
echo "I:checking that zones with slash are properly shown in XML output (${t})"
if ./xmlstats && [ -x ${CURL} ] ; then
if ./newstats
if $FEATURETEST --have-libxml2 && [ -x ${CURL} ] ; then
if $FEATURETEST --enable-newstats
then
${CURL} http://10.53.0.1:8053/xml/v3 > 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