upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-05-28 04:34:54 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

move wire_test back to bin/tests, no longer dependent on dnstap

Browse source 
wire_test is not only used by the dnstap system test, but also in
fuzz testing. it doesn't need to be installed, but it's useful to have it
built when BIND is.  this commit moves it back from bin/tests/system to
bin/tests, as a noinst_PROGRAM so that it's built by "make all" but
not installed.
This commit is contained in:
Evan Hunt 2020-05-15 12:57:18 -07:00
parent 89d7d9aff7
commit e45be9d134
5 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
bin/tests/Makefile.am
View file

@ -1 +1,13 @@
include $(top_srcdir)/Makefile.top
SUBDIRS = system
noinst_PROGRAMS = wire_test
AM_CPPFLAGS += \
$(LIBISC_CFLAGS) \
$(LIBDNS_CFLAGS)
LDADD = \
$(LIBISC_LIBS) \
$(LIBDNS_LIBS)

12
bin/tests/system/Makefile.am
View file

@ -55,18 +55,6 @@ 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 \

2
bin/tests/system/conf.sh.in
View file

@ -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/system/wire_test
WIRETEST=$TOP_BUILDDIR/bin/tests/wire_test
BIGKEY=$TOP_BUILDDIR/bin/tests/system/rsabigexponent/bigkey
GENCHECK=$TOP_BUILDDIR/bin/tests/system/rndc/gencheck

0
bin/tests/system/wire_test.c → bin/tests/wire_test.c
View file

2
util/copyrights
View file

@ -929,7 +929,6 @@
./bin/tests/system/win32/pipequeries.vcxproj.filters.in X 2016,2018,2019,2020
./bin/tests/system/win32/pipequeries.vcxproj.in X 2016,2017,2018,2019,2020
./bin/tests/system/win32/pipequeries.vcxproj.user X 2016,2018,2019,2020
./bin/tests/system/wire_test.c C 2020
./bin/tests/system/xfer/ans5/badkeydata X 2011,2018,2019,2020
./bin/tests/system/xfer/ans5/badmessageid X 2020
./bin/tests/system/xfer/ans5/goodaxfr X 2011,2018,2019,2020
@ -981,6 +980,7 @@
./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.c C 2009,2015,2016,2018,2019,2020
./bin/tools/arpaname.rst RST 2020
./bin/tools/dnstap-read.c C 2015,2016,2017,2018,2019,2020