From: Michał Kępień <michal@isc.org>
Date: Thu, 23 Apr 2020 06:07:07 +0000 (+0200)
Subject: Build wire_test
X-Git-Tag: v9.17.2~121^2~11
X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=32247dc997d4776170faba5a2f3dd0be857c155e;p=thirdparty%2Fbind9.git

Build wire_test

The bin/tests/wire_test helper program is currently not included in any
Makefile.am file.  Move its source code to bin/tests/system and build it
along other helper tools when dnstap support is requested as the
"dnstap" system test needs this tool in order to pass.
---

diff --git a/bin/tests/system/Makefile.am b/bin/tests/system/Makefile.am
index 17fa9d1205c..cca65fa19e0 100644
--- a/bin/tests/system/Makefile.am
+++ b/bin/tests/system/Makefile.am
@@ -43,7 +43,7 @@ tkey_keycreate_CPPFLAGS =	\
 	$(AM_CPPFLAGS)		\
 	$(LIBDNS_CFLAGS)
 
-tkey_keycreate_LDADD =	\
+tkey_keycreate_LDADD =		\
 	$(LDADD)		\
 	$(LIBDNS_LIBS)
 
@@ -51,10 +51,22 @@ tkey_keydelete_CPPFLAGS =	\
 	$(AM_CPPFLAGS)		\
 	$(LIBDNS_CFLAGS)
 
-tkey_keydelete_LDADD =	\
+tkey_keydelete_LDADD =		\
 	$(LDADD)		\
 	$(LIBDNS_LIBS)
 
+if HAVE_DNSTAP
+check_PROGRAMS += wire_test
+
+wire_test_CPPFLAGS =		\
+	$(AM_CPPFLAGS)		\
+	$(LIBDNS_CFLAGS)
+
+wire_test_LDADD =		\
+	$(LDADD)		\
+	$(LIBDNS_LIBS)
+endif HAVE_DNSTAP
+
 TESTS = \
 	acl additional addzone allow-query auth autosign \
 	builtin cacheclean case catz cds \
diff --git a/bin/tests/system/conf.sh.in b/bin/tests/system/conf.sh.in
index 65dbdeddb2b..dc9b73be7ce 100644
--- a/bin/tests/system/conf.sh.in
+++ b/bin/tests/system/conf.sh.in
@@ -61,7 +61,7 @@ SETTIME=$TOP_BUILDDIR/bin/dnssec/dnssec-settime
 SIGNER=$TOP_BUILDDIR/bin/dnssec/dnssec-signzone
 TSIGKEYGEN=$TOP_BUILDDIR/bin/confgen/tsig-keygen
 VERIFY=$TOP_BUILDDIR/bin/dnssec/dnssec-verify
-WIRETEST=$TOP_BUILDDIR/bin/tests/wire_test
+WIRETEST=$TOP_BUILDDIR/bin/tests/system/wire_test
 
 BIGKEY=$TOP_BUILDDIR/bin/tests/system/rsabigexponent/bigkey
 GENCHECK=$TOP_BUILDDIR/bin/tests/system/rndc/gencheck
diff --git a/bin/tests/wire_test.c b/bin/tests/system/wire_test.c
similarity index 100%
rename from bin/tests/wire_test.c
rename to bin/tests/system/wire_test.c
diff --git a/util/copyrights b/util/copyrights
index 293a843c85b..2aa21cca2b2 100644
--- a/util/copyrights
+++ b/util/copyrights
@@ -1023,7 +1023,6 @@
 ./bin/tests/win32/timer_test.vcxproj.filters.in	X	2013,2015,2018,2019,2020
 ./bin/tests/win32/timer_test.vcxproj.in		X	2013,2015,2016,2017,2018,2019,2020
 ./bin/tests/win32/timer_test.vcxproj.user	X	2013,2018,2019,2020
-./bin/tests/wire_test.c				C	1999,2000,2001,2004,2005,2007,2015,2016,2018,2019,2020
 ./bin/tools/arpaname.1				MAN	DOCBOOK
 ./bin/tools/arpaname.c				C	2009,2015,2016,2018,2019,2020
 ./bin/tools/arpaname.docbook			SGML	2009,2014,2015,2016,2018,2019,2020