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

Support DLZ filesystem detection in feature-test

Browse Source 
Do not use variable from configure to detect the feature.
This commit is contained in:
Petr Menšík
2019-01-30 15:12:54 +01:00
parent 03dcdb88a2
commit 759a7b4ce3
5 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bin/tests/system/Makefile.in
View File

@@ -19,7 +19,7 @@ SUBDIRS = dlzexternal dyndb pipelined rndc rpz rsabigexponent tkey
CINCLUDES = ${ISC_INCLUDES} ${DNS_INCLUDES}
CDEFINES = @USE_GSSAPI@
CDEFINES = @USE_GSSAPI@ @CONTRIB_DLZ@
CWARNINGS =
DNSLIBS =

2
bin/tests/system/dlz/prereq.sh.in → bin/tests/system/dlz/prereq.sh
View File

@@ -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

9
bin/tests/system/feature-test.c
View File

@@ -47,6 +47,7 @@ usage() {
fprintf(stderr, " --ipv6only=no\n");
fprintf(stderr, " --with-idn\n");
fprintf(stderr, " --with-lmdb\n");
fprintf(stderr, " --with-dlz-filesystem\n");
}
int
@@ -150,6 +151,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);

1
configure.ac
View File

@@ -2949,7 +2949,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

2
util/copyrights
View File

@@ -519,7 +519,7 @@
./bin/tests/system/dlz/ns1/dns-root/com/example/dns.d/@/NS=10=example.com.= TXT.BRIEF 2010,2016,2018,2019
./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/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/clean.sh SH 2010,2012,2014,2015,2016,2018,2019