bind9/tests/Makefile.am

include $(top_srcdir)/Makefile.top

AM_CPPFLAGS +=			\
	$(LIBISC_CFLAGS)	\
	$(LIBDNS_CFLAGS)	\
	$(LIBNS_CFLAGS)		\
	$(LIBUV_CFLAGS)		\
	-I$(top_srcdir)/lib/isc

LDADD +=			\
	$(LIBISC_LIBS)		\
	$(LIBDNS_LIBS)		\
	$(LIBNS_LIBS)

SUBDIRS = libtest isc dns ns isccfg irs
check_PROGRAMS =
Move all the unit tests to /tests/<libname>/ The unit tests are now using a common base, which means that lib/dns/tests/ code now has to include lib/isc/include/isc/test.h and link with lib/isc/test.c and lib/ns/tests has to include both libisc and libdns parts. Instead of cross-linking code between the directories, move the /lib/<foo>/test.c to /tests/<foo>.c and /lib/<foo>/include/<foo>test.h to /tests/include/tests/<foo>.h and create a single libtest.la convenience library in /tests/. At the same time, move the /lib/<foo>/tests/ to /tests/<foo>/ (but keep it symlinked to the old location) and adjust paths accordingly. In few places, we are now using absolute paths instead of relative paths, because the directory level has changed. By moving the directories under the /tests/ directory, the test-related code is kept in a single place and we can avoid referencing files between libns->libdns->libisc which is unhealthy because they live in a separate Makefile-space. In the future, the /bin/tests/ should be merged to /tests/ and symlink kept, and the /fuzz/ directory moved to /tests/fuzz/. (cherry picked from commit 2c3b2dabe9a6b3c4a10f6498a1169f39ed031eed) 2022-05-03 05:37:31 -04:00			`include $(top_srcdir)/Makefile.top`

			`AM_CPPFLAGS += \`
			`$(LIBISC_CFLAGS) \`
			`$(LIBDNS_CFLAGS) \`
			`$(LIBNS_CFLAGS) \`
			`$(LIBUV_CFLAGS) \`
			`-I$(top_srcdir)/lib/isc`

			`LDADD += \`
			`$(LIBISC_LIBS) \`
			`$(LIBDNS_LIBS) \`
			`$(LIBNS_LIBS)`

Stop the unit tests from running twice Move the libtest code into a 'libtest' subdirectory and make it one of the SUBDIRS in the tests Makefile. having it at the top level required having "." as one of the subdirs, and that caused the unit tests to be executed twice. (cherry picked from commit 568f65cc56370c211454d041c6b13d0d593cadab) 2022-05-03 22:43:23 -04:00			`SUBDIRS = libtest isc dns ns isccfg irs`
			`check_PROGRAMS =`