Commit d298aa3b authored by Evan Hunt's avatar Evan Hunt

Merge branch 'each-move-wiretest' into 'master'

move wire_test

See merge request !3544
parents 89d7d9af 93d63cd9
Pipeline #41952 passed with stages
in 28 minutes and 17 seconds
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
......
......@@ -44,11 +44,11 @@ if [ $ret != 0 ]; then echo_i "failed"; fi
status=`expr $status + $ret`
# both the 'a.example/A' lookup and the './NS' lookup to ns1
# need tocomplete before reopening/rolling for the counts to
# need to complete before reopening/rolling for the counts to
# be correct.
$DIG $DIGOPTS @10.53.0.3 a.example > dig.out
wait_for_log 20 "(./NS): query_reset" ns1/named.run || true
wait_for_log 20 "(.): reset client" ns1/named.run || true
# check three different dnstap reopen/roll methods:
# ns1: dnstap-reopen; ns2: dnstap -reopen; ns3: dnstap -roll
......
......@@ -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