Use feature-test to detect feature support in system tests

Previously, there were two different ways to detect feature support.
Either through an environment variable set by configure in conf.sh, or
using the feature-test utility.

It is more simple and consistent to have only one way of detecting the
feature support. Using the feature-test utility seems superior the the
environment variables set by configure.

(cherry picked from commit d24fb1122ea3ffaf3050c79ff6b293b89e726a07)

diff --git a/bin/tests/system/addzone/tests.sh b/bin/tests/system/addzone/tests.sh
index 7d28a050a99aab3e34100237bfd96c79fde2581d..b3e21c654ac4691a3c8ae5bf13e8118385af44b8 100755 (executable)
--- a/bin/tests/system/addzone/tests.sh
+++ b/bin/tests/system/addzone/tests.sh
@@ -46,7 +46,7 @@ n=`expr $n + 1`
 if [ $ret != 0 ]; then echo_i "failed"; fi
 status=`expr $status + $ret`
 
-if [ -n "$NZD" ]; then
+if $FEATURETEST --with-lmdb; then
     echo_i "checking that existing NZF file was renamed after migration ($n)"
     [ -e ns2/3bf305731dd26307.nzf~ ] || ret=1
     n=`expr $n + 1`
@@ -125,7 +125,7 @@ n=`expr $n + 1`
 if [ $ret != 0 ]; then echo_i "failed"; fi
 status=`expr $status + $ret`
 
-if [ -z "$NZD" ]; then
+if ! $FEATURETEST --with-lmdb; then
     echo_i "verifying no comments in NZF file ($n)"
     ret=0
     hcount=`grep "^# New zone file for view: _default" ns2/3bf305731dd26307.nzf | wc -l`
@@ -144,7 +144,7 @@ n=`expr $n + 1`
 if [ $ret != 0 ]; then echo_i "failed"; fi
 status=`expr $status + $ret`
 
-if [ -n "$NZD" ]; then
+if $FEATURETEST --with-lmdb; then
     echo_i "checking zone is present in NZD ($n)"
     ret=0
     $NZD2NZF ns2/_default.nzd | grep previous.example > /dev/null || ret=1
@@ -170,14 +170,14 @@ check_nzd2nzf() (
        ! grep previous.example nzd2nzf.out.$n > /dev/null
 )
 
-if [ -n "$NZD" ]; then
+if $FEATURETEST --with-lmdb; then
     echo_i "checking zone was deleted from NZD ($n)"
     retry_quiet 10 check_nzd2nzf || ret=1
     if [ $ret != 0 ]; then echo_i "failed"; fi
     status=`expr $status + $ret`
 fi
 
-if [ -z "$NZD" ]; then
+if ! $FEATURETEST --with-lmdb; then
     echo_i "checking NZF file now has comment ($n)"
     ret=0
     hcount=`grep "^# New zone file for view: _default" ns2/3bf305731dd26307.nzf | wc -l`
@@ -513,7 +513,7 @@ n=`expr $n + 1`
 if [ $ret != 0 ]; then echo_i "failed"; fi
 status=`expr $status + $ret`
 
-if [ -z "$NZD" ]; then
+if ! $FEATURETEST --with-lmdb; then
     echo_i "checking new NZF file has comment ($n)"
     ret=0
     hcount=`grep "^# New zone file for view: external" ns2/external.nzf | wc -l`
@@ -523,7 +523,7 @@ if [ -z "$NZD" ]; then
     status=`expr $status + $ret`
 fi
 
-if [ -n "$NZD" ]; then
+if $FEATURETEST --with-lmdb; then
     echo_i "verifying added.example in external view created an external.nzd DB ($n)"
     ret=0
     [ -e ns2/external.nzd ] || ret=1
@@ -549,7 +549,7 @@ status=`expr $status + $ret`
 
 echo_i "checking rndc showzone with newly added zone ($n)"
 _check_rndc_showzone_newly_added() (
-       if [ -z "$NZD" ]; then
+       if ! $FEATURETEST --with-lmdb; then
                expected='zone "added.example" in external { type primary; file "added.db"; };'
        else
                expected='zone "added.example" { type primary; file "added.db"; };'
@@ -656,7 +656,7 @@ n=`expr $n + 1`
 if [ $ret != 0 ]; then echo_i "failed"; fi
 status=`expr $status + $ret`
 
-if [ -n "$NZD" ]; then
+if $FEATURETEST --with-lmdb; then
     echo_i "checking NZD file was created in new-zones-directory ($n)"
     expect=ns2/new-zones/directory.nzd
 else

diff --git a/bin/tests/system/statschannel/tests.sh b/bin/tests/system/statschannel/tests.sh
index 58bbd43678a881246ae52dac9a5647daecaa3f8a..0480b01a5c54492253b2fd9bfbfe0061ee2d56c8 100644 (file)
--- a/bin/tests/system/statschannel/tests.sh
+++ b/bin/tests/system/statschannel/tests.sh
@@ -18,7 +18,7 @@ SYSTEMTESTTOP=..
 DIGCMD="$DIG @10.53.0.2 -p ${PORT}"
 RNDCCMD="$RNDC -c $SYSTEMTESTTOP/common/rndc.conf -p ${CONTROLPORT} -s"
 
-if [ ! "$HAVEJSONSTATS" ]
+if ! $FEATURETEST --have-json-c
 then
     unset PERL_JSON
     echo_i "JSON was not configured; skipping" >&2
@@ -30,7 +30,7 @@ else
     echo_i "JSON tests require JSON library; skipping" >&2
 fi
 
-if [ ! "$HAVEXMLSTATS" ]
+if ! $FEATURETEST --have-libxml2
 then
     unset PERL_XML
     echo_i "XML was not configured; skipping" >&2
@@ -138,7 +138,7 @@ n=`expr $n + 1`
 echo_i "checking consistency between regular and compressed output ($n)"
 for i in 1 2 3 4 5; do
        ret=0
-       if [ "$HAVEXMLSTATS" ];
+       if $FEATURETEST --have-libxml2;
        then
                URL=http://10.53.0.2:${EXTRAPORT1}/xml/v3/server
                filter_str='s#<current-time>.*</current-time>##g'
@@ -164,7 +164,7 @@ n=`expr $n + 1`
 
 ret=0
 echo_i "checking if compressed output is really compressed ($n)"
-if [ "$HAVEZLIB" ];
+if $FEATURETEST --with-zlib;
 then
     REGSIZE=`cat regular.headers | \
        grep -i Content-Length | sed -e "s/.*: \([0-9]*\).*/\1/"`