tests: another build cleanup

.ycm_extra_conf.py

@@ -20,7 +20,6 @@ FLAGS = [
 CONFIG_H = 'src/config.h'
 
 INCLUDES = [
-    ('tests', ['src', 'tests/_libtap']),
 ]
 
 def relative_path(filename):

Knot.files

@@ -428,14 +428,6 @@ tests-fuzz/knotd_wrap/server.c
 tests-fuzz/knotd_wrap/tcp-handler.c
 tests-fuzz/knotd_wrap/udp-handler.c
 tests-fuzz/main.c
-tests/_libtap/runtests.c
-tests/_libtap/tap/basic.c
-tests/_libtap/tap/basic.h
-tests/_libtap/tap/files.c
-tests/_libtap/tap/files.h
-tests/_libtap/tap/float.c
-tests/_libtap/tap/float.h
-tests/_libtap/tap/macros.h
 tests/contrib/test_base32hex.c
 tests/contrib/test_base64.c
 tests/contrib/test_dynarray.c
@@ -518,5 +510,13 @@ tests/libzscanner/processing.h
 tests/libzscanner/zscanner-tool.c
 tests/modules/test_onlinesign.c
 tests/modules/test_rrl.c
+tests/tap/basic.c
+tests/tap/basic.h
+tests/tap/files.c
+tests/tap/files.h
+tests/tap/float.c
+tests/tap/float.h
+tests/tap/macros.h
+tests/tap/runtests.c
 tests/utils/test_cert.c
 tests/utils/test_lookup.c

Makefile.am

@@ -7,7 +7,6 @@ singlehtml install-singlehtml:
 
 .PHONY: check-compile
 check-compile:
-	$(MAKE) $(AM_MAKEFLAGS) -C tests/_libtap $@
 	$(MAKE) $(AM_MAKEFLAGS) -C tests $@
 	$(MAKE) $(AM_MAKEFLAGS) -C tests-fuzz $@
 

configure.ac

@@ -582,7 +582,6 @@ AC_CONFIG_FILES([Makefile
                  Doxyfile
                  doc/Makefile
                  tests/Makefile
-                 tests/_libtap/Makefile
                  tests-fuzz/Makefile
                  samples/Makefile
                  python/Makefile

tests/.gitignore

+/tap/runtests
 /runtests.log
 
 /contrib/test_base32hex

tests/Makefile.am

-SUBDIRS = _libtap .
-
 AM_CPPFLAGS = \
-	-include $(top_builddir)/src/config.h \
-	-I$(top_srcdir)/tests/_libtap \
-	-I$(top_srcdir)/src \
-	-I$(top_srcdir)/src/libdnssec \
-	-I$(top_srcdir)/src/libdnssec/shared \
+	-include $(top_builddir)/src/config.h	\
+	-I$(top_srcdir)/src			\
+	-I$(top_srcdir)/src/libdnssec		\
+	-I$(top_srcdir)/src/libdnssec/shared	\
 	$(gnutls_CFLAGS)
 
 LDADD = \
-	$(top_builddir)/tests/_libtap/libtap.la \
-	$(top_builddir)/src/libknot.la \
-	$(top_builddir)/src/libknotd.la \
-	$(top_builddir)/src/libdnssec.la \
-	$(top_builddir)/src/libcontrib.la \
+	libtap.la				\
+	$(top_builddir)/src/libknot.la		\
+	$(top_builddir)/src/libknotd.la		\
+	$(top_builddir)/src/libshared.la	\
+	$(top_builddir)/src/libdnssec.la	\
+	$(top_builddir)/src/libcontrib.la	\
 	$(top_builddir)/src/libzscanner.la
 
 EXTRA_DIST = \
-	libdnssec/sample_keys.h		\
-	knot/semantic_check_data	\
-	knot/test_semantic_check.in	\
-	libzscanner/data		\
-	libzscanner/test_zscanner.in	\
+	tap/libtap.sh				\
+	libdnssec/sample_keys.h			\
+	knot/semantic_check_data		\
+	knot/test_semantic_check.in		\
+	libzscanner/data			\
+	libzscanner/test_zscanner.in		\
 	libzscanner/TESTS
 
+check_LTLIBRARIES = libtap.la
+
+libtap_la_SOURCES = \
+	tap/basic.c				\
+	tap/basic.h				\
+	tap/files.c				\
+	tap/files.h				\
+	tap/float.c				\
+	tap/float.h				\
+	tap/macros.h
+
+EXTRA_PROGRAMS = tap/runtests
+
+tap_runtests_LDADD =
+
 check_PROGRAMS = \
-	contrib/test_base32hex		\
-	contrib/test_base64		\
-	contrib/test_dynarray		\
-	contrib/test_heap		\
-	contrib/test_net		\
-	contrib/test_net_shortwrite	\
-	contrib/test_qp-trie		\
-	contrib/test_siphash		\
-	contrib/test_sockaddr		\
-	contrib/test_string		\
-	contrib/test_strtonum		\
-	contrib/test_time		\
+	contrib/test_base32hex			\
+	contrib/test_base64			\
+	contrib/test_dynarray			\
+	contrib/test_heap			\
+	contrib/test_net			\
+	contrib/test_net_shortwrite		\
+	contrib/test_qp-trie			\
+	contrib/test_siphash			\
+	contrib/test_sockaddr			\
+	contrib/test_string			\
+	contrib/test_strtonum			\
+	contrib/test_time			\
 	contrib/test_wire_ctx
 
 check_PROGRAMS += \
-	libdnssec/test_binary		\
-	libdnssec/test_crypto		\
-	libdnssec/test_key		\
-	libdnssec/test_key_algorithm	\
-	libdnssec/test_key_ds		\
-	libdnssec/test_keyid		\
-	libdnssec/test_keystore_pkcs11	\
-	libdnssec/test_keystore_pkcs8	\
-	libdnssec/test_keystore_pkcs8_dir \
-	libdnssec/test_keytag		\
-	libdnssec/test_list		\
-	libdnssec/test_nsec_bitmap	\
-	libdnssec/test_nsec_hash	\
-	libdnssec/test_random		\
-	libdnssec/test_sign		\
-	libdnssec/test_sign_der		\
-	libdnssec/test_shared_bignum	\
-	libdnssec/test_shared_dname	\
+	libdnssec/test_binary			\
+	libdnssec/test_crypto			\
+	libdnssec/test_key			\
+	libdnssec/test_key_algorithm		\
+	libdnssec/test_key_ds			\
+	libdnssec/test_keyid			\
+	libdnssec/test_keystore_pkcs11		\
+	libdnssec/test_keystore_pkcs8		\
+	libdnssec/test_keystore_pkcs8_dir 	\
+	libdnssec/test_keytag			\
+	libdnssec/test_list			\
+	libdnssec/test_nsec_bitmap		\
+	libdnssec/test_nsec_hash		\
+	libdnssec/test_random			\
+	libdnssec/test_sign			\
+	libdnssec/test_sign_der			\
+	libdnssec/test_shared_bignum		\
+	libdnssec/test_shared_dname		\
 	libdnssec/test_tsig
 
 check_PROGRAMS += \
-	knot/test_acl			\
-	knot/test_changeset		\
-	knot/test_conf			\
-	knot/test_conf_tools		\
-	knot/test_confdb		\
-	knot/test_confio		\
-	knot/test_dthreads		\
-	knot/test_fdset			\
-	knot/test_journal		\
-	knot/test_kasp_db		\
-	knot/test_node			\
-	knot/test_process_query		\
-	knot/test_query_module		\
-	knot/test_requestor		\
-	knot/test_server		\
-	knot/test_worker_pool		\
-	knot/test_worker_queue		\
-	knot/test_zone-tree		\
-	knot/test_zone-update		\
-	knot/test_zone_events		\
-	knot/test_zone_serial		\
-	knot/test_zone_timers		\
+	knot/test_acl				\
+	knot/test_changeset			\
+	knot/test_conf				\
+	knot/test_conf_tools			\
+	knot/test_confdb			\
+	knot/test_confio			\
+	knot/test_dthreads			\
+	knot/test_fdset				\
+	knot/test_journal			\
+	knot/test_kasp_db			\
+	knot/test_node				\
+	knot/test_process_query			\
+	knot/test_query_module			\
+	knot/test_requestor			\
+	knot/test_server			\
+	knot/test_worker_pool			\
+	knot/test_worker_queue			\
+	knot/test_zone-tree			\
+	knot/test_zone-update			\
+	knot/test_zone_events			\
+	knot/test_zone_serial			\
+	knot/test_zone_timers			\
 	knot/test_zonedb
 
+knot_test_acl_SOURCES = \
+	knot/test_acl.c				\
+	knot/test_conf.h
+
+knot_test_conf_SOURCES = \
+	knot/test_conf.c			\
+	knot/test_conf.h
+
+knot_test_confdb_SOURCES = \
+	knot/test_confdb.c			\
+	knot/test_conf.h
+
+knot_test_confio_SOURCES = \
+	knot/test_confio.c			\
+	knot/test_conf.h
+
+knot_test_process_query_SOURCES = \
+	knot/test_process_query.c		\
+	knot/test_server.h			\
+	knot/test_conf.h
+
 check_PROGRAMS += \
-	libknot/test_control		\
-	libknot/test_cookies		\
-	libknot/test_db			\
-	libknot/test_descriptor		\
-	libknot/test_dname		\
-	libknot/test_edns		\
-	libknot/test_edns_ecs		\
-	libknot/test_endian		\
-	libknot/test_lookup		\
-	libknot/test_pkt		\
-	libknot/test_rdata		\
-	libknot/test_rdataset		\
-	libknot/test_rrset		\
-	libknot/test_rrset-wire		\
-	libknot/test_tsig		\
-	libknot/test_yparser		\
-	libknot/test_ypschema		\
-	libknot/test_yptrafo		\
-	libknot/test_wire		
+	libknot/test_control			\
+	libknot/test_cookies			\
+	libknot/test_db				\
+	libknot/test_descriptor			\
+	libknot/test_dname			\
+	libknot/test_edns			\
+	libknot/test_edns_ecs			\
+	libknot/test_endian			\
+	libknot/test_lookup			\
+	libknot/test_pkt			\
+	libknot/test_rdata			\
+	libknot/test_rdataset			\
+	libknot/test_rrset			\
+	libknot/test_rrset-wire			\
+	libknot/test_tsig			\
+	libknot/test_yparser			\
+	libknot/test_ypschema			\
+	libknot/test_yptrafo			\
+	libknot/test_wire
 
 check_PROGRAMS += \
-	utils/test_cert			\
+	utils/test_cert				\
 	utils/test_lookup
 
 if STATIC_MODULE_onlinesign
@@ -139,7 +174,7 @@ utils_test_lookup_CPPFLAGS = \
 	$(libedit_CFLAGS)
 
 utils_test_lookup_LDADD = \
-	$(top_builddir)/tests/_libtap/libtap.la \
+	libtap.la \
 	$(top_builddir)/src/libknotus.la \
 	$(libedit_LIBS)
 
@@ -148,14 +183,13 @@ utils_test_cert_CPPFLAGS = \
 	$(libedit_CFLAGS)
 
 utils_test_cert_LDADD = \
-	$(top_builddir)/tests/_libtap/libtap.la \
+	libtap.la \
 	$(top_builddir)/src/libknotus.la \
 	$(libedit_LIBS)
 
-EXTRA_PROGRAMS = \
-	libzscanner/zscanner-tool
+EXTRA_PROGRAMS += libzscanner/zscanner-tool
 
-libzscanner_zscanner_tool_SOURCES =	\
+libzscanner_zscanner_tool_SOURCES = \
 	libzscanner/zscanner-tool.c	\
 	libzscanner/processing.h	\
 	libzscanner/processing.c
@@ -178,19 +212,13 @@ libzscanner/test_zscanner: libzscanner/zscanner-tool
 
 CLEANFILES = $(check_SCRIPTS) $(EXTRA_PROGRAMS) runtests.log
 
-check-compile: $(check_PROGRAMS) $(check_SCRIPTS)
+check-compile: $(check_LTLIBRARIES) $(EXTRA_PROGRAMS) $(check_PROGRAMS) $(check_SCRIPTS)
 
 AM_V_RUNTESTS = $(am__v_RUNTESTS_@AM_V@)
 am__v_RUNTESTS_ = $(am__v_RUNTESTS_@AM_DEFAULT_V@)
 am__v_RUNTESTS_0 =
 am__v_RUNTESTS_1 = RET=$$?; if [ "$$RET" != "0" ]; then cat "$(builddir)/runtests.log"; exit $$RET; fi
-check-local: $(check_PROGRAMS) $(check_SCRIPTS)
-	@$(top_builddir)/tests/_libtap/runtests -s $(srcdir) -b $(builddir) \
+check-local: $(check_LTLIBRARIES) $(EXTRA_PROGRAMS) $(check_PROGRAMS) $(check_SCRIPTS)
+	@$(top_builddir)/tests/tap/runtests -s $(srcdir) -b $(builddir)  \
 	 -L $(builddir)/runtests.log $(check_PROGRAMS) $(check_SCRIPTS); \
 	$(AM_V_RUNTESTS)
-
-knot_test_acl_SOURCES = knot/test_acl.c knot/test_conf.h
-knot_test_conf_SOURCES = knot/test_conf.c knot/test_conf.h
-knot_test_confdb_SOURCES = knot/test_confdb.c knot/test_conf.h
-knot_test_confio_SOURCES = knot/test_confio.c knot/test_conf.h
-knot_test_process_query_SOURCES = knot/test_process_query.c knot/test_server.h knot/test_conf.h

tests/_libtap/.gitignore

-/Makefile
-/Makefile.in
-/runtests
-/libtap.a

tests/_libtap/Makefile.am

-AM_CPPFLAGS = \
-	-include $(top_builddir)/src/config.h \
-	-I$(top_srcdir)/src
-
-libtap_la_SOURCES = \
-	tap/basic.c		\
-	tap/basic.h		\
-	tap/files.c		\
-	tap/files.h		\
-	tap/float.c		\
-	tap/float.h		\
-	tap/macros.h
-
-check_LTLIBRARIES = libtap.la
-
-check_PROGRAMS = \
-	runtests
-
-EXTRA_DIST = \
-	tap/libtap.sh
-
-check-compile: $(check_LTLIBRARIES) $(check_PROGRAMS)

tests/knot/test_semantic_check.in

@@ -3,7 +3,7 @@
 KZONECHECK="@top_builddir@/src/kzonecheck"
 DATA="@top_srcdir@/tests/knot/semantic_check_data"
 
-. "@top_srcdir@/tests/_libtap/tap/libtap.sh"
+. "@top_srcdir@/tests/tap/libtap.sh"
 
 TMPDIR=$(test_tmpdir)
 LOG="$TMPDIR/log"

tests/libzscanner/test_zscanner.in

@@ -3,7 +3,7 @@
 SOURCE=@top_srcdir@/tests/libzscanner
 BUILD=@top_builddir@/tests/libzscanner
 
-. @top_srcdir@/tests/_libtap/tap/libtap.sh
+. @top_srcdir@/tests/tap/libtap.sh
 
 cd "$BUILD"