Merge branch 'ondrej/fix-the-CFLAGS-order-in-tests' into 'main'

Move the include Makefile.tests to the bottom of Makefile.am(s) See merge request isc-projects/bind9!4927
2026-06-06 08:22:04 -04:00 · 2021-06-24 13:49:03 +00:00 · 2021-06-24 13:49:03 +00:00 · 33394f11c3
commit 33394f11c3
parent 5c82f7c71b e59a359929
17 changed files with 37 additions and 61 deletions
--- a/Makefile.tests
+++ b/Makefile.tests
@ -1,11 +1,17 @@
 # Hey Emacs, this is -*- makefile-automake -*- file!
 # vim: filetype=automake

+unit-local: check
+
+TESTS = $(check_PROGRAMS)
+
+LOG_COMPILER = $(builddir)/../../unit-test-driver.sh
+
 AM_CPPFLAGS +=					\
 	$(CMOCKA_CFLAGS)			\
 	-DNAMED_PLUGINDIR=\"$(libdir)/named\"	\
 	-DSKIPPED_TEST_EXIT_CODE=77		\
 	-DTESTS_DIR=\"$(abs_srcdir)\"

-LDADD =			\
+LDADD +=					\
 	$(CMOCKA_LIBS)
--- a/Makefile.top
+++ b/Makefile.top
@ -12,6 +12,7 @@ AM_CPPFLAGS =					\
 	-I$(srcdir)/include

 AM_LDFLAGS =
+LDADD =

 if HOST_MACOS
 AM_LDFLAGS +=					\
--- a/bin/check/Makefile.am
+++ b/bin/check/Makefile.am
@ -7,7 +7,7 @@ AM_CPPFLAGS +=			\
 	$(LIBISCCFG_CFLAGS)	\
 	$(LIBBIND9_CFLAGS)

-AM_CPPFLAGS +=						\
+AM_CPPFLAGS +=			\
 	-DNAMED_CONFFILE=\"${sysconfdir}/named.conf\"

 noinst_LTLIBRARIES = libcheck-tool.la
@ -16,7 +16,7 @@ libcheck_tool_la_SOURCES =	\
 	check-tool.h		\
 	check-tool.c

-LDADD =				\
+LDADD +=			\
 	libcheck-tool.la	\
 	$(LIBISC_LIBS)		\
 	$(LIBDNS_LIBS)		\
--- a/bin/confgen/Makefile.am
+++ b/bin/confgen/Makefile.am
@ -5,7 +5,7 @@ AM_CPPFLAGS +=			\
 	$(LIBDNS_CFLAGS)	\
 	-DRNDC_KEYFILE=\"${sysconfdir}/rndc.key\"

-LDADD =				\
+LDADD +=			\
 	libconfgen.la		\
 	$(LIBISC_LIBS)		\
 	$(LIBDNS_LIBS)
--- a/bin/dig/Makefile.am
+++ b/bin/dig/Makefile.am
@ -8,7 +8,7 @@ AM_CPPFLAGS +=			\
 	$(LIBBIND9_CFLAGS)	\
 	$(LIBIDN2_CFLAGS)

-LDADD =				\
+LDADD +=			\
 	libdighost.la		\
 	$(LIBISC_LIBS)		\
 	$(LIBDNS_LIBS)		\
@ -19,8 +19,8 @@ LDADD =				\

 noinst_LTLIBRARIES = libdighost.la

-libdighost_la_SOURCES = \
-	dighost.h	\
+libdighost_la_SOURCES =		\
+	dighost.h		\
 	dighost.c

 bin_PROGRAMS = dig host nslookup
--- a/bin/dnssec/Makefile.am
+++ b/bin/dnssec/Makefile.am
@ -4,12 +4,12 @@ AM_CPPFLAGS +=			\
 	$(LIBISC_CFLAGS)	\
 	$(LIBDNS_CFLAGS)

-AM_CPPFLAGS +=						\
+AM_CPPFLAGS +=			\
 	-DNAMED_CONFFILE=\"${sysconfdir}/named.conf\"

 noinst_LTLIBRARIES = libdnssectool.la

-LDADD =				\
+LDADD +=			\
 	libdnssectool.la	\
 	$(LIBISC_LIBS)		\
 	$(LIBDNS_LIBS)
--- a/bin/nsupdate/Makefile.am
+++ b/bin/nsupdate/Makefile.am
@ -10,10 +10,10 @@ AM_CPPFLAGS +=			\
 	$(KRB5_CFLAGS)		\
 	$(READLINE_CFLAGS)

-AM_CPPFLAGS += \
+AM_CPPFLAGS +=			\
 	-DSESSION_KEYFILE=\"${localstatedir}/run/named/session.key\"

-LDADD =				\
+LDADD +=			\
 	$(LIBISC_LIBS)		\
 	$(LIBDNS_LIBS)		\
 	$(LIBISCCFG_LIBS)	\
--- a/bin/pkcs11/Makefile.am
+++ b/bin/pkcs11/Makefile.am
@ -3,7 +3,7 @@ include $(top_srcdir)/Makefile.top
 AM_CPPFLAGS +=			\
 	$(LIBISC_CFLAGS)

-LDADD =				\
+LDADD +=			\
 	$(LIBISC_LIBS)

 bin_PROGRAMS =			\
--- a/bin/tests/system/Makefile.am
+++ b/bin/tests/system/Makefile.am
@ -14,7 +14,7 @@ SUBDIRS = dyndb/driver dlzexternal/driver hooks/driver
 AM_CPPFLAGS +=			\
 	$(LIBISC_CFLAGS)

-LDADD =				\
+LDADD +=			\
 	$(LIBISC_LIBS)

 if HAVE_PERL
--- a/bin/tools/Makefile.am
+++ b/bin/tools/Makefile.am
@ -4,7 +4,7 @@ AM_CPPFLAGS +=			\
 	$(LIBISC_CFLAGS)	\
 	$(LIBDNS_CFLAGS)

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

--- a/fuzz/Makefile.am
+++ b/fuzz/Makefile.am
@ -8,7 +8,7 @@ AM_CPPFLAGS +=				\
 AM_LDFLAGS +=				\
 	$(FUZZ_LDFLAGS)

-LDADD =					\
+LDADD +=				\
 	libfuzzmain.la			\
 	$(LIBISC_LIBS)			\
 	$(LIBDNS_LIBS)
--- a/lib/dns/tests/Makefile.am
+++ b/lib/dns/tests/Makefile.am
@ -1,5 +1,4 @@
 include $(top_srcdir)/Makefile.top
-include $(top_srcdir)/Makefile.tests

 AM_CPPFLAGS +=				\
 	$(LIBISC_CFLAGS)		\
@ -8,9 +7,9 @@ AM_CPPFLAGS +=				\
 	-DSRCDIR=\"$(abs_srcdir)\"	\
 	-DBUILDDIR=\"$(abs_builddir)\"

-LDADD +=			\
-	libdnstest.la		\
-	$(LIBISC_LIBS)		\
+LDADD +=				\
+	libdnstest.la			\
+	$(LIBISC_LIBS)			\
 	$(LIBDNS_LIBS)

 check_LTLIBRARIES = libdnstest.la
@ -48,8 +47,6 @@ check_PROGRAMS =		\
 	zonemgr_test		\
 	zt_test

-TESTS = $(check_PROGRAMS)
-
 if HAVE_PERL

 check_PROGRAMS +=		\
@ -109,8 +106,6 @@ rsa_test_CPPFLAGS =		\
 	$(AM_CPPFLAGS)		\
 	$(OPENSSL_CFLAGS)

-unit-local: check
-
 EXTRA_DIST =			\
 	Kdh.+002+18602.key	\
 	Krsa.+005+29235.key	\
@ -118,4 +113,4 @@ EXTRA_DIST =			\
 	testdata		\
 	testkeys

-LOG_COMPILER = $(builddir)/../../unit-test-driver.sh
+include $(top_srcdir)/Makefile.tests
--- a/lib/irs/tests/Makefile.am
+++ b/lib/irs/tests/Makefile.am
@ -1,5 +1,4 @@
 include $(top_srcdir)/Makefile.top
-include $(top_srcdir)/Makefile.tests

 AM_CPPFLAGS +=			\
 	$(LIBISC_CFLAGS)	\
@ -9,13 +8,9 @@ LDADD +=			\
 	$(LIBISC_LIBS)		\
 	$(LIBIRS_LIBS)

-check_PROGRAMS = \
+check_PROGRAMS =		\
 	resconf_test

-TESTS = $(check_PROGRAMS)
-
-unit-local: check
-
 EXTRA_DIST = testdata

-LOG_COMPILER = $(builddir)/../../unit-test-driver.sh
+include $(top_srcdir)/Makefile.tests
--- a/lib/isc/tests/Makefile.am
+++ b/lib/isc/tests/Makefile.am
@ -1,5 +1,4 @@
 include $(top_srcdir)/Makefile.top
-include $(top_srcdir)/Makefile.tests

 AM_CPPFLAGS +=			\
 	$(LIBISC_CFLAGS)
@ -15,7 +14,7 @@ libisctest_la_SOURCES =		\
 	isctest.h		\
 	uv_wrap.h

-TESTS =			\
+check_PROGRAMS =	\
 	aes_test	\
 	buffer_test	\
 	counter_test	\
@ -49,9 +48,6 @@ TESTS =			\
 	time_test	\
 	timer_test

-check_PROGRAMS =	\
-	$(TESTS)
-
 doh_test_CPPFLAGS =	\
 	$(AM_CPPFLAGS)	\
 	$(LIBUV_CFLAGS)	\
@ -91,8 +87,6 @@ netmgr_test_LDADD =	\
 	$(LDADD)	\
 	$(LIBUV_LIBS)

-unit-local: check
-
 EXTRA_DIST = testdata

-LOG_COMPILER = $(builddir)/../../unit-test-driver.sh
+include $(top_srcdir)/Makefile.tests
--- a/lib/isccc/tests/Makefile.am
+++ b/lib/isccc/tests/Makefile.am
@ -1,5 +1,4 @@
 include $(top_srcdir)/Makefile.top
-include $(top_srcdir)/Makefile.tests

 AM_CPPFLAGS +=			\
 	$(LIBISC_CFLAGS)	\
@ -9,11 +8,7 @@ LDADD +=			\
 	$(LIBISC_LIBS)		\
 	$(LIBISCCC_LIBS)

-check_PROGRAMS =	\
+check_PROGRAMS =		\
 	result_test

-TESTS = $(check_PROGRAMS)
-
-unit-local: check
-
-LOG_COMPILER = $(builddir)/../../unit-test-driver.sh
+include $(top_srcdir)/Makefile.tests
--- a/lib/isccfg/tests/Makefile.am
+++ b/lib/isccfg/tests/Makefile.am
@ -1,5 +1,4 @@
 include $(top_srcdir)/Makefile.top
-include $(top_srcdir)/Makefile.tests

 AM_CPPFLAGS +=			\
 	$(LIBISC_CFLAGS)	\
@ -11,12 +10,8 @@ LDADD +=			\
 	$(LIBDNS_LIBS)		\
 	$(LIBISCCFG_LIBS)

-check_PROGRAMS =	\
-	duration_test	\
+check_PROGRAMS =		\
+	duration_test		\
 	parser_test

-TESTS = $(check_PROGRAMS)
-
-unit-local: check
-
-LOG_COMPILER = $(builddir)/../../unit-test-driver.sh
+include $(top_srcdir)/Makefile.tests
--- a/lib/ns/tests/Makefile.am
+++ b/lib/ns/tests/Makefile.am
@ -1,5 +1,4 @@
 include $(top_srcdir)/Makefile.top
-include $(top_srcdir)/Makefile.tests

 AM_CPPFLAGS +=			\
 	$(LIBISC_CFLAGS)	\
@ -14,7 +13,7 @@ LDADD +=			\

 check_LTLIBRARIES = libnstest.la
 libnstest_la_SOURCES =		\
-	nstest.c 		\
+	nstest.c		\
 	nstest.h

 check_PROGRAMS =		\
@ -23,10 +22,6 @@ check_PROGRAMS =		\
 	plugin_test		\
 	query_test

-TESTS = $(check_PROGRAMS)
-
-unit-local: check
-
 EXTRA_DIST = testdata

-LOG_COMPILER = $(builddir)/../../unit-test-driver.sh
+include $(top_srcdir)/Makefile.tests