From: Petr Menšík <pemensik@redhat.com>
Date: Wed, 30 Jan 2019 14:12:54 +0000 (+0100)
Subject: Support DLZ filesystem detection in feature-test
X-Git-Tag: v9.11.7~86^2~2
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=1e5c61d5cc82bc9e146532865a853adbe023ba74;p=thirdparty%2Fbind9.git

Support DLZ filesystem detection in feature-test

Do not use variable from configure to detect the feature.

(cherry picked from commit 759a7b4ce31040f3cceec0d219e379dd1b1dfea9)
---

diff --git a/bin/tests/system/Makefile.in b/bin/tests/system/Makefile.in
index c18b4c53e39..dea2f7573d8 100644
--- a/bin/tests/system/Makefile.in
+++ b/bin/tests/system/Makefile.in
@@ -19,7 +19,7 @@ SUBDIRS =	dlzexternal dyndb lwresd pipelined rndc rsabigexponent tkey
 
 CINCLUDES =	${ISC_INCLUDES} ${DNS_INCLUDES}
 
-CDEFINES =	@USE_GSSAPI@
+CDEFINES =	@USE_GSSAPI@ @CONTRIB_DLZ@
 CWARNINGS =
 
 DNSLIBS =
diff --git a/bin/tests/system/dlz/prereq.sh.in b/bin/tests/system/dlz/prereq.sh
similarity index 91%
rename from bin/tests/system/dlz/prereq.sh.in
rename to bin/tests/system/dlz/prereq.sh
index afec653e0d9..fb3328e4097 100644
--- a/bin/tests/system/dlz/prereq.sh.in
+++ b/bin/tests/system/dlz/prereq.sh
@@ -12,7 +12,7 @@
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
 
-if [ "@DLZ_SYSTEM_TEST@" != "filesystem" ]; then
+if ! $FEATURETEST --with-dlz-filesystem; then
         echo_i "DLZ filesystem driver not supported"
         exit 255
 fi
diff --git a/bin/tests/system/feature-test.c b/bin/tests/system/feature-test.c
index f934b6356e6..3ac34e83d14 100644
--- a/bin/tests/system/feature-test.c
+++ b/bin/tests/system/feature-test.c
@@ -49,6 +49,7 @@ usage() {
 	fprintf(stderr, "	--rpz-nsip\n");
 	fprintf(stderr, "	--with-idn\n");
 	fprintf(stderr, "	--with-lmdb\n");
+	fprintf(stderr, "	--with-dlz-filesystem\n");
 }
 
 int
@@ -168,6 +169,14 @@ main(int argc, char **argv) {
 #endif
 	}
 
+	if (strcmp(argv[1], "--with-dlz-filesystem") == 0) {
+#ifdef DLZ_FILESYSTEM
+		return (0);
+#else
+		return (1);
+#endif
+	}
+
 	if (strcmp(argv[1], "--ipv6only=no") == 0) {
 #ifdef WIN32
 		return (0);
diff --git a/configure.ac b/configure.ac
index 26c509e7424..dd478760fbe 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5389,7 +5389,6 @@ AC_CONFIG_FILES([
 	bin/tests/pkcs11/benchmarks/Makefile
 	bin/tests/system/Makefile
 	bin/tests/system/conf.sh
-	bin/tests/system/dlz/prereq.sh
 	bin/tests/system/dlzexternal/Makefile
 	bin/tests/system/dlzexternal/ns1/dlzs.conf
 	bin/tests/system/dyndb/Makefile
diff --git a/util/copyrights b/util/copyrights
index 2f080ab9506..d73e274fbc9 100644
--- a/util/copyrights
+++ b/util/copyrights
@@ -1030,7 +1030,7 @@
 ./bin/tests/system/dlz/ns1/dns-root/com/example/dns.d/@/SOA=10=ns.example.com.=root.example.com.=2010062900=0=0=0=10=	TXT.BRIEF	2010,2016,2018,2019
 ./bin/tests/system/dlz/ns1/dns-root/com/example/xfr.d/10.53.0.1	TXT.BRIEF	2010,2016,2018,2019
 ./bin/tests/system/dlz/ns1/named.conf.in	CONF-C	2018,2019
-./bin/tests/system/dlz/prereq.sh.in		SH	2011,2012,2016,2018,2019
+./bin/tests/system/dlz/prereq.sh		SH	2011,2012,2016,2018,2019
 ./bin/tests/system/dlz/setup.sh			SH	2018,2019
 ./bin/tests/system/dlz/tests.sh			SH	2010,2011,2012,2013,2015,2016,2018,2019
 ./bin/tests/system/dlzexternal/Makefile.in	MAKE	2011,2012,2014,2015,2016,2017,2018,2019