d0d728803b
System tests are failing for named, because it cannot detect it does not support filesystem SDB. Move feature test to named directory, so it is built for every variant.
59 lines
1.9 KiB
Diff
59 lines
1.9 KiB
Diff
From 4293078b294cbb766abe84d3b1618b1cb5413c82 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= <pemensik@redhat.com>
|
|
Date: Wed, 30 Jan 2019 14:37:17 +0100
|
|
Subject: [PATCH 2/2] Create feature-test in source directory
|
|
|
|
Feature-test tool is used in system tests to test compiled in changes.
|
|
Because we build more variants of named with different configuration,
|
|
compile feature-test for each of them this way.
|
|
---
|
|
bin/named/Makefile.in | 11 ++++++++++-
|
|
bin/tests/system/conf.sh.in | 2 +-
|
|
2 files changed, 11 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/bin/named/Makefile.in b/bin/named/Makefile.in
|
|
index 1c413973d0..b31df9a718 100644
|
|
--- a/bin/named/Makefile.in
|
|
+++ b/bin/named/Makefile.in
|
|
@@ -79,7 +79,7 @@ NOSYMLIBS = ${LWRESLIBS} ${DNSLIBS} ${BIND9LIBS} \
|
|
|
|
SUBDIRS = unix
|
|
|
|
-TARGETS = named@EXEEXT@ lwresd@EXEEXT@
|
|
+TARGETS = named@EXEEXT@ lwresd@EXEEXT@ feature-test@EXEEXT@
|
|
|
|
GEOIPLINKOBJS = geoip.@O@
|
|
|
|
@@ -151,6 +151,15 @@ lwresd@EXEEXT@: named@EXEEXT@
|
|
rm -f lwresd@EXEEXT@
|
|
@LN@ named@EXEEXT@ lwresd@EXEEXT@
|
|
|
|
+# Bit of hack, do not produce intermediate .o object for featuretest
|
|
+feature-test.@O@: ${top_srcdir}/bin/tests/system/feature-test.c
|
|
+ ${LIBTOOL_MODE_COMPILE} ${CC} ${ALL_CFLAGS} \
|
|
+ -c ${top_srcdir}/bin/tests/system/feature-test.c
|
|
+
|
|
+feature-test@EXEEXT@: feature-test.@O@
|
|
+ ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} \
|
|
+ -o $@ feature-test.@O@ ${ISCLIBS} ${LIBS}
|
|
+
|
|
doc man:: ${MANOBJS}
|
|
|
|
docclean manclean maintainer-clean::
|
|
diff --git a/bin/tests/system/conf.sh.in b/bin/tests/system/conf.sh.in
|
|
index 2236f0a151..b072af8467 100644
|
|
--- a/bin/tests/system/conf.sh.in
|
|
+++ b/bin/tests/system/conf.sh.in
|
|
@@ -64,7 +64,7 @@ DNSTAPREAD=$TOP/bin/tools/dnstap-read
|
|
MDIG=$TOP/bin/tools/mdig
|
|
NZD2NZF=$TOP/bin/tools/named-nzd2nzf
|
|
FSTRM_CAPTURE=@FSTRM_CAPTURE@
|
|
-FEATURETEST=$TOP/bin/tests/system/feature-test
|
|
+FEATURETEST=$TOP/bin/named/feature-test
|
|
|
|
RANDFILE=$TOP/bin/tests/system/random.data
|
|
|
|
--
|
|
2.20.1
|
|
|