]> git.ipfire.org Git - thirdparty/bind9.git/commitdiff
use grep rather than xmllint
authorMark Andrews <marka@isc.org>
Tue, 18 Aug 2015 00:03:58 +0000 (10:03 +1000)
committerMark Andrews <marka@isc.org>
Tue, 18 Aug 2015 00:08:53 +0000 (10:08 +1000)
(cherry picked from commit 486c763015bea6784a658cd1f629f03194d9233c)

bin/tests/system/statistics/tests.sh

index fef8d4902858611ff29fabcd6330f7ae0cad4d98..9ff7f198db68d46c183417b45eb6588ae020bae0 100644 (file)
@@ -107,11 +107,11 @@ status=`expr $status + $ret`
 ret=0
 t=`expr $t + 1`
 echo "I:checking that zones with slash are properly shown in XML output (${t})"
-if [ -x ${CURL} -a -x ${XMLLINT} ] ; then
+if [ -x ${CURL} ] ; then
     ${CURL} http://10.53.0.1:8053/xml/v3/zones > curl.out.${t} 2>/dev/null || ret=1
-    ${XMLLINT} --xpath '//statistics/views/view/zones/zone[@name="32/1.0.0.127-in-addr.example"]' curl.out.${t} > /dev/null 2>&1 || ret=1
+    grep '<zone name="32/1.0.0.127-in-addr.example" rdataclass="IN">' curl.out.${t} > /dev/null || ret=1
 else
-  echo "I:skipping test as curl and/or xmllint were not found"
+    echo "I:skipping test as curl was not found"
 fi
 if [ $ret != 0 ]; then echo "I:failed"; fi
 status=`expr $status + $ret`