Special case tests for lmdb

When compiling BIND 9 without lmdb, this is promoted from
'not operational' to 'not configured', resulting in a failure (and no
longer a warning) if ldmb-related configuration options are set.

Special case certain system tests to avoid test failures on systems
that do not have lmdb.

diff --git a/bin/tests/system/checkconf/good-lmdb-mapsize-largest.conf b/bin/tests/system/checkconf/lmdb-mapsize-largest.conf
similarity index 100%
rename from bin/tests/system/checkconf/good-lmdb-mapsize-largest.conf
rename to bin/tests/system/checkconf/lmdb-mapsize-largest.conf

diff --git a/bin/tests/system/checkconf/good-lmdb-mapsize-smallest.conf b/bin/tests/system/checkconf/lmdb-mapsize-smallest.conf
similarity index 100%
rename from bin/tests/system/checkconf/good-lmdb-mapsize-smallest.conf
rename to bin/tests/system/checkconf/lmdb-mapsize-smallest.conf

diff --git a/bin/tests/system/checkconf/tests.sh b/bin/tests/system/checkconf/tests.sh
index d2350d4e5bdfb51b075436d67a846422040a5f92..47bf31b5d3c314c85e420c93436b568116ee40d6 100644 (file)
--- a/bin/tests/system/checkconf/tests.sh
+++ b/bin/tests/system/checkconf/tests.sh
@@ -78,6 +78,24 @@ do
        status=`expr $status + $ret`
 done
 
+for lmdb in lmdb-*.conf
+do
+       n=`expr $n + 1`
+       ret=0
+
+       $FEATURETEST --with-lmdb
+       if [ $? -eq 0 ]; then
+               echo_i "checking that named-checkconf detects no error in $lmdb ($n)"
+               $CHECKCONF $lmdb > checkconf.out$n 2>&1
+               if [ $? != 0 ]; then echo_i "failed"; ret=1; fi
+       else
+               echo_i "checking that named-checkconf detects error in $lmdb ($n)"
+               $CHECKCONF $lmdb > checkconf.out$n 2>&1
+               if [ $? == 0 ]; then echo_i "failed"; ret=1; fi
+       fi
+       status=`expr $status + $ret`
+done
+
 n=`expr $n + 1`
 echo_i "checking that ancient options report a fatal error ($n)"
 ret=0