|
 |
2dbb09 |
From 36e3d1b08f697190b259a8421472ec16b52315b5 Mon Sep 17 00:00:00 2001
|
|
|
d0d728 |
From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= <pemensik@redhat.com>
|
|
|
d0d728 |
Date: Wed, 30 Jan 2019 14:37:17 +0100
|
|
|
371a1e |
Subject: [PATCH] Create feature-test in source directory
|
|
|
d0d728 |
|
|
|
d0d728 |
Feature-test tool is used in system tests to test compiled in changes.
|
|
|
d0d728 |
Because we build more variants of named with different configuration,
|
|
|
d0d728 |
compile feature-test for each of them this way.
|
|
|
d0d728 |
---
|
|
|
df81e8 |
bin/named/Makefile.in | 11 ++++++++++-
|
|
|
d0d728 |
bin/tests/system/conf.sh.in | 2 +-
|
|
|
df81e8 |
2 files changed, 11 insertions(+), 2 deletions(-)
|
|
|
d0d728 |
|
|
|
d0d728 |
diff --git a/bin/named/Makefile.in b/bin/named/Makefile.in
|
|
|
2dbb09 |
index 4e8006d..eecfa76 100644
|
|
|
d0d728 |
--- a/bin/named/Makefile.in
|
|
|
d0d728 |
+++ b/bin/named/Makefile.in
|
|
|
2dbb09 |
@@ -83,7 +83,7 @@ NOSYMLIBS = ${NSLIBS} ${DNSLIBS} ${BIND9LIBS} \
|
|
|
d0d728 |
|
|
|
d0d728 |
SUBDIRS = unix
|
|
|
d0d728 |
|
|
|
df81e8 |
-TARGETS = named@EXEEXT@
|
|
|
df81e8 |
+TARGETS = named@EXEEXT@ feature-test@EXEEXT@
|
|
|
d0d728 |
|
|
|
d0d728 |
GEOIPLINKOBJS = geoip.@O@
|
|
|
2dbb09 |
GEOIP2LINKOBJS = geoip.@O@
|
|
|
2dbb09 |
@@ -154,6 +154,15 @@ named@EXEEXT@: ${OBJS} ${DEPLIBS}
|
|
|
df81e8 |
export BASEOBJS="${OBJS} ${UOBJS}"; \
|
|
|
df81e8 |
${FINALBUILDCMD}
|
|
|
d0d728 |
|
|
|
d0d728 |
+# Bit of hack, do not produce intermediate .o object for featuretest
|
|
|
d0d728 |
+feature-test.@O@: ${top_srcdir}/bin/tests/system/feature-test.c
|
|
|
d0d728 |
+ ${LIBTOOL_MODE_COMPILE} ${CC} ${ALL_CFLAGS} \
|
|
|
d0d728 |
+ -c ${top_srcdir}/bin/tests/system/feature-test.c
|
|
|
d0d728 |
+
|
|
|
d0d728 |
+feature-test@EXEEXT@: feature-test.@O@
|
|
|
d0d728 |
+ ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} \
|
|
|
d0d728 |
+ -o $@ feature-test.@O@ ${ISCLIBS} ${LIBS}
|
|
|
d0d728 |
+
|
|
|
d0d728 |
doc man:: ${MANOBJS}
|
|
|
d0d728 |
|
|
|
d0d728 |
docclean manclean maintainer-clean::
|
|
|
d0d728 |
diff --git a/bin/tests/system/conf.sh.in b/bin/tests/system/conf.sh.in
|
|
|
2dbb09 |
index c713d96..20366e5 100644
|
|
|
d0d728 |
--- a/bin/tests/system/conf.sh.in
|
|
|
d0d728 |
+++ b/bin/tests/system/conf.sh.in
|
|
|
2dbb09 |
@@ -34,7 +34,7 @@ DELV=$TOP/bin/delv/delv
|
|
|
df81e8 |
DIG=$TOP/bin/dig/dig
|
|
|
df81e8 |
DNSTAPREAD=$TOP/bin/tools/dnstap-read
|
|
|
df81e8 |
DSFROMKEY=$TOP/bin/dnssec/dnssec-dsfromkey
|
|
|
d0d728 |
-FEATURETEST=$TOP/bin/tests/system/feature-test
|
|
|
d0d728 |
+FEATURETEST=$TOP/bin/named/feature-test
|
|
|
df81e8 |
FSTRM_CAPTURE=@FSTRM_CAPTURE@
|
|
|
df81e8 |
IMPORTKEY=$TOP/bin/dnssec/dnssec-importkey
|
|
|
df81e8 |
JOURNALPRINT=$TOP/bin/tools/named-journalprint
|
|
|
d0d728 |
--
|
|
|
d0d728 |
2.20.1
|
|
|
d0d728 |
|