Commit e45be9d1 authored by Evan Hunt's avatar Evan Hunt

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

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.
parent 89d7d9af
include $(top_srcdir)/Makefile.top
SUBDIRS = system
noinst_PROGRAMS = wire_test
AM_CPPFLAGS += \
$(LIBISC_CFLAGS) \
$(LIBDNS_CFLAGS)
LDADD = \
$(LIBISC_LIBS) \
$(LIBDNS_LIBS)
......@@ -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 \
......
......@@ -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
......
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment