global: Add and use LIBDOVECOT_TEST_LIBS

cmouse · cmouse · commit f89056ed78c0 · 2025-11-19T14:45:19.000+02:00
diff --git a/configure.ac b/configure.ac
@@ -644,7 +644,10 @@ LIBDOVECOT_LIBLANG='$(top_builddir)/src/lib-language/libdovecot-language.la'
 LIBDOVECOT_OPENSSL='$(top_builddir)/src/lib-ssl-iostream/libssl_iostream_openssl.la'
 LIBDOVECOT_OPENSSL_DEPS="$LIBDOVECOT_OPENSSL"
 
+LIBDOVECOT_TEST_LIBS="\$(LIBPCRE_LIBS) \$(ZLIB_LIBS) \$(MODULE_LIBS) \$(DLLIB) -lm"
+
 AC_SUBST(LIBDOVECOT)
+AC_SUBST(LIBDOVECOTTEST_LIBS)
 AC_SUBST(LIBDOVECOT_LA_LIBS)
 AC_SUBST(LIBDOVECOT_DEPS)
 AC_SUBST(LIBDOVECOT_STORAGE)
diff --git a/src/lib-auth-client/Makefile.am b/src/lib-auth-client/Makefile.am
@@ -44,7 +44,7 @@ test_libs = \
 	../lib-regex/libdregex.la \
 	../lib-test/libtest.la \
 	../lib/liblib.la \
-	$(MODULE_LIBS)
+	$(LIBDOVECOT_TEST_LIBS)
 
 test_deps = \
 	$(noinst_LTLIBRARIES) \
diff --git a/src/lib-auth/Makefile.am b/src/lib-auth/Makefile.am
@@ -62,7 +62,7 @@ test_libs = \
         ../lib-otp/libotp.la \
 	../lib-test/libtest.la \
 	../lib/liblib.la \
-	$(MODULE_LIBS)
+	$(LIBDOVECOT_TEST_LIBS)
 
 test_deps = \
 	$(noinst_LTLIBRARIES) \
diff --git a/src/lib-charset/Makefile.am b/src/lib-charset/Makefile.am
@@ -26,5 +26,5 @@ test_libs = \
 test_deps = $(noinst_LTLIBRARIES) $(test_libs)
 
 test_charset_SOURCES = test-charset.c
-test_charset_LDADD = libcharset.la $(test_libs)
+test_charset_LDADD = libcharset.la $(test_libs) $(LIBDOVECOT_TEST_LIBS)
 test_charset_DEPENDENCIES = libcharset.la $(test_deps)
diff --git a/src/lib-compression/Makefile.am b/src/lib-compression/Makefile.am
@@ -51,9 +51,9 @@ test_libs = \
 test_deps = $(test_libs)
 
 test_compression_SOURCES = test-compression.c
-test_compression_LDADD = $(test_libs)
+test_compression_LDADD = $(test_libs) $(LIBDOVECOT_TEST_LIBS)
 test_compression_DEPENDENCIES = $(test_deps)
 
 bench_compression_SOURCES = bench-compression.c
-bench_compression_LDADD = $(test_libs)
+bench_compression_LDADD = $(test_libs) $(LIBDOVECOT_TEST_LIBS)
 bench_compression_DEPENDENCIES = $(test_deps)
diff --git a/src/lib-dcrypt/Makefile.am b/src/lib-dcrypt/Makefile.am
@@ -61,6 +61,7 @@ LIBDOVECOT_TEST_DEPS = \
 	../lib/liblib.la
 LIBDOVECOT_TEST = \
 	$(LIBDOVECOT_TEST_DEPS) \
+	$(LIBDOVECOT_TEST_LIBS) \
 	$(MODULE_LIBS)
 
 test_crypto_LDADD = $(LIBDOVECOT_TEST)
diff --git a/src/lib-dict-extra/Makefile.am b/src/lib-dict-extra/Makefile.am
@@ -39,5 +39,5 @@ test_libs = \
 	../lib/liblib.la
 
 test_dict_fs_SOURCES = test-dict-fs.c
-test_dict_fs_LDADD = $(noinst_LTLIBRARIES) ../lib-fs/libfs.la $(test_libs) $(MODULE_LIBS)
+test_dict_fs_LDADD = $(noinst_LTLIBRARIES) ../lib-fs/libfs.la $(test_libs) $(LIBDOVECOT_TEST_LIBS)
 test_dict_fs_DEPENDENCIES = $(noinst_LTLIBRARIES) ../lib-fs/libfs.la $(test_libs)
diff --git a/src/lib-dict/Makefile.am b/src/lib-dict/Makefile.am
@@ -62,5 +62,5 @@ test_libs = \
 	../lib/liblib.la
 
 test_dict_SOURCES = test-dict.c
-test_dict_LDADD = $(test_libs) $(DLLIB)
+test_dict_LDADD = $(test_libs) $(LIBDOVECOT_TEST_LIBS)
 test_dict_DEPENDENCIES = $(test_libs)
diff --git a/src/lib-dns-client/Makefile.am b/src/lib-dns-client/Makefile.am
@@ -31,7 +31,7 @@ test_libs = \
 	../lib/liblib.la
 
 test_dns_lookup_SOURCES = test-dns-lookup.c
-test_dns_lookup_LDADD = $(test_libs) $(DLLIB)
+test_dns_lookup_LDADD = $(test_libs) $(LIBDOVECOT_TEST_LIBS)
 
 pkginc_libdir=$(pkgincludedir)
 pkginc_lib_HEADERS = $(headers)
diff --git a/src/lib-dns/Makefile.am b/src/lib-dns/Makefile.am
@@ -21,7 +21,7 @@ test_libs = \
 	../lib/liblib.la
 
 test_dns_util_SOURCES = test-dns-util.c
-test_dns_util_LDADD = $(test_libs)
+test_dns_util_LDADD = $(test_libs) $(LIBDOVECOT_TEST_LIBS)
 
 pkginc_libdir=$(pkgincludedir)
 pkginc_lib_HEADERS = $(headers)
diff --git a/src/lib-fs/Makefile.am b/src/lib-fs/Makefile.am
@@ -60,7 +60,7 @@ test_deps = \
 
 test_libs = \
 	$(test_deps) \
-	$(MODULE_LIBS)
+	$(LIBDOVECOT_TEST_LIBS)
 
 test_fs_metawrap_SOURCES = test-fs-metawrap.c
 test_fs_metawrap_LDADD = $(test_libs)
diff --git a/src/lib-http/Makefile.am b/src/lib-http/Makefile.am
@@ -87,8 +87,7 @@ test_libs = \
 	../lib-var-expand/libvar_expand.la \
 	../lib-regex/libdregex.la \
 	../lib-test/libtest.la \
-	../lib/liblib.la \
-	$(MODULE_LIBS)
+	../lib/liblib.la
 
 test_deps = \
 	$(noinst_LTLIBRARIES) \
@@ -100,15 +99,15 @@ test_deps = \
 	../lib/liblib.la
 
 test_http_url_SOURCES = test-http-url.c
-test_http_url_LDADD = http-url.lo http-header.lo $(test_libs)
+test_http_url_LDADD = http-url.lo http-header.lo $(test_libs) $(LIBDOVECOT_TEST_LIBS)
 test_http_url_DEPENDENCIES = $(test_deps)
 
 test_http_date_SOURCES = test-http-date.c
-test_http_date_LDADD = http-date.lo  $(test_libs)
+test_http_date_LDADD = http-date.lo  $(test_libs) $(LIBDOVECOT_TEST_LIBS)
 test_http_date_DEPENDENCIES = $(test_deps)
 
 test_http_header_parser_SOURCES = test-http-header-parser.c
-test_http_header_parser_LDADD = http-parser.lo http-header-parser.lo http-header.lo $(test_libs)
+test_http_header_parser_LDADD = http-parser.lo http-header-parser.lo http-header.lo $(test_libs) $(LIBDOVECOT_TEST_LIBS)
 test_http_header_parser_DEPENDENCIES = $(test_deps)
 
 test_http_transfer_SOURCES = test-http-transfer.c
@@ -117,14 +116,14 @@ test_http_transfer_LDADD = \
 	http-header-parser.lo \
 	http-transfer-chunked.lo \
 	http-header.lo \
-	$(test_libs)
+	$(test_libs) $(LIBDOVECOT_TEST_LIBS)
 test_http_transfer_DEPENDENCIES = $(test_deps)
 
 test_http_auth_SOURCES = test-http-auth.c
 test_http_auth_LDADD = \
 	http-auth.lo \
 	http-parser.lo \
-	$(test_libs)
+	$(test_libs) $(LIBDOVECOT_TEST_LIBS)
 test_http_auth_DEPENDENCIES = $(test_deps)
 
 test_http_response_parser_SOURCES = test-http-response-parser.c
@@ -136,7 +135,7 @@ test_http_response_parser_LDADD = \
 	http-transfer-chunked.lo \
 	http-message-parser.lo \
 	http-response-parser.lo \
-	$(test_libs)
+	$(test_libs) $(LIBDOVECOT_TEST_LIBS)
 test_http_response_parser_DEPENDENCIES = $(test_deps)
 
 test_http_request_parser_SOURCES = test-http-request-parser.c
@@ -149,7 +148,7 @@ test_http_request_parser_LDADD = \
 	http-transfer-chunked.lo \
 	http-message-parser.lo \
 	http-request-parser.lo \
-	$(test_libs)
+	$(test_libs) $(LIBDOVECOT_TEST_LIBS)
 test_http_request_parser_DEPENDENCIES = $(test_deps)
 
 test_http_libs = \
@@ -159,7 +158,7 @@ test_http_libs = \
 	../lib-ssl-iostream/libssl_iostream.la \
 	../lib-master/libmaster.la \
 	../lib-auth-client/libauth-client.la \
-	$(test_libs)
+	$(test_libs) $(LIBDOVECOT_TEST_LIBS)
 test_http_deps = \
 	libhttp.la \
 	../lib-dns-client/libdns-client.la  \
@@ -169,7 +168,7 @@ test_http_deps = \
 	../lib-auth-client/libauth-client.la \
 	$(test_deps)
 
-test_http_libs_ssl = ../lib-ssl-iostream/libssl_iostream_openssl.la
+test_http_libs_ssl = ../lib-ssl-iostream/libssl_iostream_openssl.la $(LIBDOVECOT_TEST_LIBS)
 
 test_http_payload_SOURCES = test-http-payload.c
 test_http_payload_LDFLAGS = -export-dynamic
diff --git a/src/lib-imap-client/Makefile.am b/src/lib-imap-client/Makefile.am
@@ -38,7 +38,7 @@ test_deps = \
 
 test_libs = \
 	$(test_deps) \
-	$(MODULE_LIBS)
+	$(LIBDOVECOT_TEST_LIBS)
 
 test_imapc_client_SOURCES = test-imapc-client.c
 test_imapc_client_LDADD = $(test_libs)
diff --git a/src/lib-imap/Makefile.am b/src/lib-imap/Makefile.am
@@ -59,9 +59,10 @@ test_programs = \
 test_libs = \
 	../lib-charset/libcharset.la \
 	../lib-test/libtest.la \
-	../lib/liblib.la
+	../lib/liblib.la \
+	$(LIBDOVECOT_TEST_LIBS)
 
-test_deps = $(noinst_LTLIBRARIES) $(test_libs)
+test_deps = $(noinst_LTLIBRARIES)
 
 test_imap_bodystructure_SOURCES = test-imap-bodystructure.c
 test_imap_bodystructure_LDADD = imap-bodystructure.lo imap-envelope.lo imap-quote.lo imap-parser.lo imap-arg.lo ../lib-mail/libmail.la $(test_libs)
diff --git a/src/lib-json/Makefile.am b/src/lib-json/Makefile.am
@@ -53,14 +53,14 @@ json_format_LDADD = \
 	libjson.la \
 	../lib-charset/libcharset.la \
 	../lib/liblib.la \
-	$(MODULE_LIBS)
+	$(LIBDOVECOT_TEST_LIBS)
 
 test_libs = \
 	libjson.la \
 	../lib-test/libtest.la \
 	../lib-charset/libcharset.la \
 	../lib/liblib.la \
-	$(MODULE_LIBS)
+	$(LIBDOVECOT_TEST_LIBS)
 test_deps = \
 	libjson.la \
 	../lib-test/libtest.la \
diff --git a/src/lib-language/Makefile.am b/src/lib-language/Makefile.am
@@ -108,20 +108,20 @@ test_libs = ../lib-dovecot/libdovecot.la
 test_deps = $(noinst_LTLIBRARIES) $(test_libs)
 
 test_lang_icu_SOURCES = test-lang-icu.c
-test_lang_icu_LDADD = lang-icu.lo $(LIBICU_LIBS) $(test_libs)
+test_lang_icu_LDADD = lang-icu.lo $(LIBICU_LIBS) $(test_libs) $(LIBDOVECOT_TEST_LIBS)
 test_lang_icu_DEPENDENCIES = lang-icu.lo $(test_deps)
 
 test_lang_filter_SOURCES = test-lang-filter.c
-test_lang_filter_LDADD = liblanguage.la $(test_libs)
+test_lang_filter_LDADD = liblanguage.la $(test_libs) $(LIBDOVECOT_TEST_LIBS)
 test_lang_filter_DEPENDENCIES = liblanguage.la $(test_deps)
 
 if BUILD_LANG_EXTTEXTCAT
 TEST_LANGUAGE = test-language
 test_language_SOURCES = test-language.c
-test_language_LDADD = language.lo $(test_libs) $(TEXTCAT_LIBS)
+test_language_LDADD = language.lo $(test_libs) $(LIBDOVECOT_TEST_LIBS) $(TEXTCAT_LIBS)
 test_language_DEPENDENCIES = $(test_deps)
 endif
 
 test_lang_tokenizer_SOURCES = test-lang-tokenizer.c
-test_lang_tokenizer_LDADD = liblanguage.la $(test_libs)
+test_lang_tokenizer_LDADD = liblanguage.la $(test_libs) $(LIBDOVECOT_TEST_LIBS)
 test_lang_tokenizer_DEPENDENCIES = liblanguage.la $(test_deps)
diff --git a/src/lib-login/Makefile.am b/src/lib-login/Makefile.am
@@ -40,8 +40,7 @@ test_libs = \
 	../lib-var-expand/libvar_expand.la \
 	../lib-regex/libdregex.la \
 	../lib-test/libtest.la \
-	../lib/liblib.la \
-	$(MODULE_LIBS)
+	../lib/liblib.la
 
 test_deps = \
 	liblogin.la \
@@ -58,5 +57,5 @@ test_deps = \
 	../lib/liblib.la
 
 test_login_server_auth_SOURCES = test-login-server-auth.c
-test_login_server_auth_LDADD = $(test_libs)
+test_login_server_auth_LDADD = $(test_libs) $(LIBDOVECOT_TEST_LIBS)
 test_login_server_auth_DEPENDENCIES = $(test_deps)
diff --git a/src/lib-mail/Makefile.am b/src/lib-mail/Makefile.am
@@ -113,6 +113,13 @@ test_programs = \
 	test-rfc2231-parser \
 	test-rfc822-parser
 
+test_deps = $(noinst_LTLIBRARIES) \
+	../lib-charset/libcharset.la \
+	../lib-test/libtest.la \
+	../lib/liblib.la
+
+test_libs = $(test_deps) $(LIBDOVECOT_TEST_LIBS)
+
 fuzz_programs =
 
 if USE_FUZZER
@@ -157,13 +164,6 @@ endif
 
 noinst_PROGRAMS += $(fuzz_programs)
 
-test_libs = \
-	$(noinst_LTLIBRARIES) \
-	../lib-charset/libcharset.la \
-	../lib-test/libtest.la \
-	../lib/liblib.la
-
-test_deps = $(noinst_LTLIBRARIES) $(test_libs)
 
 test_istream_dot_SOURCES = test-istream-dot.c
 test_istream_dot_LDADD = $(test_libs)
diff --git a/src/lib-master/Makefile.am b/src/lib-master/Makefile.am
@@ -63,13 +63,12 @@ test_deps = \
 	../lib/liblib.la
 
 test_libs = \
-	$(test_deps) \
-	$(MODULE_LIBS)
+	$(test_deps)
 
 test_event_stats_SOURCES = test-event-stats.c
-test_event_stats_LDADD = $(test_libs)
+test_event_stats_LDADD = $(test_libs) $(LIBDOVECOT_TEST_LIBS)
 test_event_stats_DEPENDENCIES = $(test_deps)
 
 test_master_service_settings_SOURCES = test-master-service-settings.c
-test_master_service_settings_LDADD = $(test_libs)
+test_master_service_settings_LDADD = $(test_libs) $(LIBDOVECOT_TEST_LIBS)
 test_master_service_settings_DEPENDENCIES = $(test_deps)
diff --git a/src/lib-oauth2/Makefile.am b/src/lib-oauth2/Makefile.am
@@ -49,8 +49,7 @@ test_libs = \
 	../lib-var-expand/libvar_expand.la \
 	../lib-regex/libdregex.la \
 	../lib-test/libtest.la \
-	../lib/liblib.la \
-	$(MODULE_LIBS)
+	../lib/liblib.la
 test_deps = \
 	$(noinst_LTLIBRARIES) \
 	../lib-dcrypt/libdcrypt_openssl_static.la \
@@ -71,11 +70,11 @@ test_deps = \
 	../lib/liblib.la
 
 test_oauth2_json_SOURCES = test-oauth2-json.c
-test_oauth2_json_LDADD = $(test_libs)
+test_oauth2_json_LDADD = $(test_libs) $(SSL_LIBS) $(LIBDOVECOT_TEST_LIBS)
 test_oauth2_json_DEPENDENCIES = $(test_deps)
 
 test_oauth2_jwt_SOURCES = test-oauth2-jwt.c
-test_oauth2_jwt_LDADD = $(test_libs)
+test_oauth2_jwt_LDADD = $(test_libs) $(SSL_LIBS) $(LIBDOVECOT_TEST_LIBS)
 if HAVE_WHOLE_ARCHIVE
 test_oauth2_jwt_LDFLAGS = \
 	-Wl,$(LD_WHOLE_ARCHIVE),../lib-json/.libs/libjson.a,../lib-ssl-iostream/.libs/libssl_iostream.a,$(LD_NO_WHOLE_ARCHIVE)
diff --git a/src/lib-program-client/Makefile.am b/src/lib-program-client/Makefile.am
@@ -42,14 +42,13 @@ test_libs = \
 	../lib-charset/libcharset.la \
 	../lib-var-expand/libvar_expand.la \
 	../lib-regex/libdregex.la \
-	../lib/liblib.la \
-	$(MODULE_LIBS)
+	../lib/liblib.la
 
 test_program_client_local_SOURCE = test-program-client-local.c
-test_program_client_local_LDADD = $(test_libs)
+test_program_client_local_LDADD = $(test_libs) $(LIBDOVECOT_TEST_LIBS)
 
 test_program_client_unix_SOURCE = test-program-client-unix.c
-test_program_client_unix_LDADD = $(test_libs)
+test_program_client_unix_LDADD = $(test_libs) $(LIBDOVECOT_TEST_LIBS)
 
 test_program_client_net_SOURCE = test-program-client-net.c
-test_program_client_net_LDADD = $(test_libs)
+test_program_client_net_LDADD = $(test_libs) $(LIBDOVECOT_TEST_LIBS)
diff --git a/src/lib-regex/Makefile.am b/src/lib-regex/Makefile.am
@@ -33,7 +33,7 @@ test_regex_SOURCES = test-regex.c
 test_regex_LDADD = libdregex.la \
 		   ../lib-test/libtest.la \
 		   ../lib/liblib.la \
-		   $(LIBPCRE_LIBS)
+		   $(LIBDOVECOT_TEST_LIBS)
 test_regex_DEPENDENCIES = libdregex.la
 
 else
diff --git a/src/lib-sasl/Makefile.am b/src/lib-sasl/Makefile.am
@@ -109,17 +109,17 @@ test_libs = \
 test_deps = $(test_libs)
 
 test_sasl_oauth2_SOURCES = test-sasl-oauth2.c
-test_sasl_oauth2_LDADD = $(test_libs)
+test_sasl_oauth2_LDADD = $(test_libs) $(LIBDOVECOT_TEST_LIBS)
 test_sasl_oauth2_DEPENDENCIES = $(test_deps)
 
 test_sasl_client_SOURCES = test-sasl-client.c
-test_sasl_client_LDADD = $(test_libs)
+test_sasl_client_LDADD = $(test_libs) $(LIBDOVECOT_TEST_LIBS)
 test_sasl_client_DEPENDENCIES = $(test_deps)
 
 test_sasl_authentication_SOURCES = \
 	dsasl-client-mech-ntlm-dummy.c \
 	test-sasl-authentication.c
-test_sasl_authentication_LDADD = $(test_libs)
+test_sasl_authentication_LDADD = $(test_libs) $(LIBDOVECOT_TEST_LIBS)
 test_sasl_authentication_DEPENDENCIES = $(test_deps)
 if HAVE_GSSAPI
 test_sasl_authentication_SOURCES += \
@@ -143,7 +143,7 @@ fuzz_sasl_authentication_LDFLAGS = $(FUZZER_LDFLAGS)
 fuzz_sasl_authentication_SOURCES = \
 	dsasl-client-mech-ntlm-dummy.c \
 	fuzz-sasl-authentication.c
-fuzz_sasl_authentication_LDADD = $(test_libs)
+fuzz_sasl_authentication_LDADD = $(test_libs) $(LIBDOVECOT_TEST_LIBS)
 fuzz_sasl_authentication_DEPENDENCIES = $(test_deps)
 if HAVE_GSSAPI
 fuzz_sasl_authentication_SOURCES += \
diff --git a/src/lib-settings/Makefile.am b/src/lib-settings/Makefile.am
@@ -50,9 +50,9 @@ test_libs = \
 	../lib/liblib.la
 
 test_settings_parser_SOURCES = test-settings-parser.c
-test_settings_parser_LDADD = $(test_libs) $(DLLIB)
+test_settings_parser_LDADD = $(test_libs) $(LIBDOVECOT_TEST_LIBS)
 test_settings_parser_DEPENDENCIES = $(test_libs)
 
 test_settings_SOURCES = test-settings.c
-test_settings_LDADD = $(test_libs) $(DLLIB)
+test_settings_LDADD = $(test_libs) $(LIBDOVECOT_TEST_LIBS)
 test_settings_DEPENDENCIES = $(test_libs)
diff --git a/src/lib-smtp/Makefile.am b/src/lib-smtp/Makefile.am
diff --git a/src/lib-ssl-iostream/Makefile.am b/src/lib-ssl-iostream/Makefile.am
diff --git a/src/lib-var-expand-crypt/Makefile.am b/src/lib-var-expand-crypt/Makefile.am
diff --git a/src/lib-var-expand/Makefile.am b/src/lib-var-expand/Makefile.am
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
