global: Use check-local in Makefile.am instead of overriding check directly

This helps with dependency problems, like running "make check" in
lib-storage without "make" first would try to compile the test programs
too early and fail.

diff --git a/src/anvil/Makefile.am b/src/anvil/Makefile.am
index 01b58ffe748ed26d9b649f196b55bbd54c3138d3..1af526fe635e83590f612cefc14811405f9a774c 100644 (file)
--- a/src/anvil/Makefile.am
+++ b/src/anvil/Makefile.am
@@ -42,8 +42,7 @@ test_penalty_SOURCES = test-penalty.c
 test_penalty_LDADD = penalty.o $(test_libs)
 test_penalty_DEPENDENCIES = $(pkglibexec_PROGRAMS) $(test_libs)
 
-check: check-am check-test
-check-test: all-am
+check-local:
        for bin in $(test_programs); do \
          if ! $(RUN_TEST) ./$$bin; then exit 1; fi; \
        done

diff --git a/src/auth/Makefile.am b/src/auth/Makefile.am
index 3dfd7a70440f5527dfb47edb99d27aa156d5e448..b6e9f291bcff247931403a4a4472229cb11617c5 100644 (file)
--- a/src/auth/Makefile.am
+++ b/src/auth/Makefile.am
@@ -248,8 +248,7 @@ test_auth_SOURCES = \
 test_auth_LDADD = $(test_libs) $(auth_libs) $(AUTH_LIBS)
 test_auth_DEPENDENCIES = $(pkglibexec_PROGRAMS) $(test_libs)
 
-check: check-am check-test
-check-test: all-am
+check-local:
        for bin in $(test_programs); do \
          if ! $(RUN_TEST) ./$$bin; then exit 1; fi; \
        done

diff --git a/src/director/Makefile.am b/src/director/Makefile.am
index fa14e05cf61eda8332a75a4cf5ee31fba6538c94..c202353e3e70892d84ac9f7e178b6cd92638271f 100644 (file)
--- a/src/director/Makefile.am
+++ b/src/director/Makefile.am
@@ -64,8 +64,7 @@ test_user_directory_SOURCES = test-user-directory.c
 test_user_directory_LDADD = user-directory.o $(test_libs)
 test_user_directory_DEPENDENCIES = $(pkglibexec_PROGRAMS) $(test_libs)
 
-check: check-am check-test
-check-test: all-am
+check-local:
        for bin in $(test_programs); do \
          if ! $(RUN_TEST) ./$$bin; then exit 1; fi; \
        done

diff --git a/src/doveadm/Makefile.am b/src/doveadm/Makefile.am
index cd5bca99134187aa76c6f738c8b85cec150613c4..cda12ade2bd8baaae5f0ab3c1bf24d8b258ea3e8 100644 (file)
--- a/src/doveadm/Makefile.am
+++ b/src/doveadm/Makefile.am
@@ -188,8 +188,7 @@ test_doveadm_util_SOURCES = doveadm-util.c test-doveadm-util.c
 test_doveadm_util_LDADD = $(test_libs) $(MODULE_LIBS)
 test_doveadm_util_DEPENDENCIES = $(test_deps)
 
-check: check-am check-test
-check-test: all-am
+check-local:
        for bin in $(test_programs); do \
          if ! $(RUN_TEST) ./$$bin; then exit 1; fi; \
        done

diff --git a/src/doveadm/dsync/Makefile.am b/src/doveadm/dsync/Makefile.am
index 16d88bf962a999212e3cf266fdd77fb62b6f1c2e..20cbfc74f3699c5747b9020918d8eccb8b029d66 100644 (file)
--- a/src/doveadm/dsync/Makefile.am
+++ b/src/doveadm/dsync/Makefile.am
@@ -70,8 +70,7 @@ test_dsync_mailbox_tree_sync_SOURCES = test-dsync-mailbox-tree-sync.c
 test_dsync_mailbox_tree_sync_LDADD = dsync-mailbox-tree-sync.lo dsync-mailbox-tree.lo $(test_libs)
 test_dsync_mailbox_tree_sync_DEPENDENCIES = $(pkglib_LTLIBRARIES) $(test_libs)
 
-check: check-am check-test
-check-test: all-am
+check-local:
        for bin in $(test_programs); do \
          if ! $(RUN_TEST) ./$$bin; then exit 1; fi; \
        done

diff --git a/src/lib-charset/Makefile.am b/src/lib-charset/Makefile.am
index 122d1dff1b858736d632a25b4c12cc396e493027..e9d0ea83177bd3f2da692fc3f4e33e5714401d22 100644 (file)
--- a/src/lib-charset/Makefile.am
+++ b/src/lib-charset/Makefile.am
@@ -29,8 +29,7 @@ test_charset_SOURCES = test-charset.c
 test_charset_LDADD = libcharset.la $(test_libs)
 test_charset_DEPENDENCIES = libcharset.la $(test_deps)
 
-check: check-am check-test
-check-test: all-am
+check-local:
        for bin in $(test_programs); do \
          if ! $(RUN_TEST) ./$$bin; then exit 1; fi; \
        done

diff --git a/src/lib-compression/Makefile.am b/src/lib-compression/Makefile.am
index 299209e903c0c7d4c1f5779266a1246b1b9545c0..3c6c875a6f976d3a5eb9f86438dcae7089ddc27a 100644 (file)
--- a/src/lib-compression/Makefile.am
+++ b/src/lib-compression/Makefile.am
@@ -45,8 +45,7 @@ test_compression_SOURCES = test-compression.c
 test_compression_LDADD = $(test_libs)
 test_compression_DEPENDENCIES = $(test_deps)
 
-check: check-am check-test
-check-test: all-am
+check-local:
        for bin in $(test_programs); do \
          if ! $(RUN_TEST) ./$$bin; then exit 1; fi; \
        done

diff --git a/src/lib-dcrypt/Makefile.am b/src/lib-dcrypt/Makefile.am
index 6d8b5d737719c6837cdaaf3c81855da6798ff982..2dcdf956dc13403734beaf8a78f53c1ec8d6b8fd 100644 (file)
--- a/src/lib-dcrypt/Makefile.am
+++ b/src/lib-dcrypt/Makefile.am
@@ -45,9 +45,7 @@ EXTRA_DIST = \
 test_programs = test-crypto test-stream
 noinst_PROGRAMS = $(test_programs)
 
-check: check-am check-test
-
-check-test: all-am
+check-local:
        for bin in $(test_programs); do \
          if ! $(RUN_TEST) ./$$bin; then exit 1; fi; \
        done

diff --git a/src/lib-dict-backend/Makefile.am b/src/lib-dict-backend/Makefile.am
index c255fa70f63199e0412f5d91fd863d47730211d5..7e24b8b6c7d7ce0cf37fe7ce2dde0f64e93b7e86 100644 (file)
--- a/src/lib-dict-backend/Makefile.am
+++ b/src/lib-dict-backend/Makefile.am
@@ -117,8 +117,7 @@ test_dict_sql_DEPENDENCIES = \
        ../lib-settings/libsettings.la \
        $(test_libs)
 
-check: check-am check-test
-check-test: all-am
+check-local:
        for bin in $(test_programs) $(check_PROGRAMS); do \
          if ! $(RUN_TEST) ./$$bin; then exit 1; fi; \
        done

diff --git a/src/lib-dict/Makefile.am b/src/lib-dict/Makefile.am
index 5bf74d4e806eaac85841572934b5e3373730cc3f..cd17c883b3040f02fb6c82e0bf9cf1f1760ee1ba 100644 (file)
--- a/src/lib-dict/Makefile.am
+++ b/src/lib-dict/Makefile.am
@@ -44,8 +44,23 @@ test_dict_client_SOURCES = test-dict-client.c
 test_dict_client_LDADD = $(noinst_LTLIBRARIES) ../lib/liblib.la
 test_dict_client_DEPENDENCIES = $(noinst_LTLIBRARIES) $(test_libs)
 
-check: check-am check-test
-check-test: all-am
-       for bin in $(test_programs); do \
+test_dict_sql_CFLAGS = $(AM_CPPFLAGS) -DDICT_SRC_DIR=\"$(top_srcdir)/src/lib-dict\"
+test_dict_sql_SOURCES = \
+       test-dict-sql.c
+test_dict_sql_LDADD = \
+       $(noinst_LTLIBRARIES) \
+       ../lib-sql/libdriver_test.la \
+       ../lib-sql/libsql.la \
+       ../lib-settings/libsettings.la \
+       $(test_libs)
+test_dict_sql_DEPENDENCIES = \
+       $(noinst_LTLIBRARIES) \
+       ../lib-sql/libdriver_test.la \
+       ../lib-sql/libsql.la \
+       ../lib-settings/libsettings.la \
+       $(test_libs)
+
+check-local:
+       for bin in $(test_programs) $(check_PROGRAMS); do \
          if ! $(RUN_TEST) ./$$bin; then exit 1; fi; \
        done

diff --git a/src/lib-dns/Makefile.am b/src/lib-dns/Makefile.am
index 302e37cf3d4b30db3ce677eba59f68678b74e360..cd3c2279df6b20907e09e857761fde175f006b24 100644 (file)
--- a/src/lib-dns/Makefile.am
+++ b/src/lib-dns/Makefile.am
@@ -26,8 +26,7 @@ test_dns_util_LDADD = $(test_libs)
 test_dns_util_CFLAGS = $(AM_CPPFLAGS) \
        -I$(top_srcdir)/src/lib-test
 
-check: check-am check-test
-check-test: all-am
+check-local:
        for bin in $(test_programs); do \
          if test "$$bin" = "test-program-client-local"; then \
            if ! env NOVALGRIND=yes $(RUN_TEST) ./$$bin; then exit 1; fi; \

diff --git a/src/lib-fs/Makefile.am b/src/lib-fs/Makefile.am
index e53bba5365897d876063674bc890467ddabd8f51..e5ae056c337140e731f781b382d1c8f9a2f89df3 100644 (file)
--- a/src/lib-fs/Makefile.am
+++ b/src/lib-fs/Makefile.am
@@ -64,8 +64,7 @@ test_fs_posix_SOURCES = test-fs-posix.c
 test_fs_posix_LDADD = $(test_libs)
 test_fs_posix_DEPENDENCIES = $(test_deps)
 
-check: check-am check-test
-check-test: all-am
+check-local:
        for bin in $(test_programs); do \
          if ! $(RUN_TEST) ./$$bin; then exit 1; fi; \
        done

diff --git a/src/lib-fts/Makefile.am b/src/lib-fts/Makefile.am
index ee37a6795c872ac614d80861477500d2fc6e3075..2eeb38fc1e34086db95ea642413742ebc5de10b5 100644 (file)
--- a/src/lib-fts/Makefile.am
+++ b/src/lib-fts/Makefile.am
@@ -149,8 +149,7 @@ test_fts_tokenizer_SOURCES = test-fts-tokenizer.c
 test_fts_tokenizer_LDADD = fts-tokenizer.lo fts-tokenizer-generic.lo fts-tokenizer-address.lo fts-tokenizer-common.lo ../lib-mail/libmail.la $(test_libs)
 test_fts_tokenizer_DEPENDENCIES = ../lib-mail/libmail.la $(test_deps)
 
-check: check-am check-test
-check-test: all-am
+check-local:
        for bin in $(test_programs); do \
          if ! $(RUN_TEST) ./$$bin; then exit 1; fi; \
        done

diff --git a/src/lib-http/Makefile.am b/src/lib-http/Makefile.am
index 6e3e2e410e490d4f2a670fe34650bb4e966c26b2..f2cf47852419cb27d2e78989625b873a0f446d96 100644 (file)
--- a/src/lib-http/Makefile.am
+++ b/src/lib-http/Makefile.am
@@ -184,8 +184,7 @@ test_http_server_errors_LDADD = \
 test_http_server_errors_DEPENDENCIES = \
        $(test_http_deps)
 
-check: check-am check-test
-check-test: all-am
+check-local:
        for bin in $(test_programs); do \
          if ! $(RUN_TEST) ./$$bin; then exit 1; fi; \
        done

diff --git a/src/lib-imap-client/Makefile.am b/src/lib-imap-client/Makefile.am
index 3dfcf197fd8035e7174f29e0c73e86c167235db6..8fe8a8d0911da4028809d89a9fc0ffd83f401349 100644 (file)
--- a/src/lib-imap-client/Makefile.am
+++ b/src/lib-imap-client/Makefile.am
@@ -47,8 +47,7 @@ test_imapc_client_SOURCES = test-imapc-client.c
 test_imapc_client_LDADD = $(test_libs)
 test_imapc_client_DEPENDENCIES = $(test_deps)
 
-check: check-am check-test
-check-test: all-am
+check-local:
        for bin in $(test_programs); do \
          if ! $(RUN_TEST) ./$$bin; then exit 1; fi; \
        done

diff --git a/src/lib-imap/Makefile.am b/src/lib-imap/Makefile.am
index 45b62973b02a432d1247055bccfe7f69d792904d..9223a4717942037db2538f478295cdc45e509bdb 100644 (file)
--- a/src/lib-imap/Makefile.am
+++ b/src/lib-imap/Makefile.am
@@ -92,8 +92,7 @@ test_imap_util_SOURCES = test-imap-util.c
 test_imap_util_LDADD = imap-util.lo imap-arg.lo $(test_libs)
 test_imap_util_DEPENDENCIES = $(test_deps)
 
-check: check-am check-test
-check-test: all-am
+check-local:
        for bin in $(test_programs); do \
          if ! $(RUN_TEST) ./$$bin; then exit 1; fi; \
        done

diff --git a/src/lib-index/Makefile.am b/src/lib-index/Makefile.am
index ecaac792af0a1561aa22a3fd3d83141b4699cd35..4c77c00ecc60e80023402427b6ffa51ea94b95c1 100644 (file)
--- a/src/lib-index/Makefile.am
+++ b/src/lib-index/Makefile.am
@@ -111,8 +111,7 @@ test_mail_transaction_log_view_SOURCES = test-mail-transaction-log-view.c
 test_mail_transaction_log_view_LDADD = mail-transaction-log-view.lo $(test_libs)
 test_mail_transaction_log_view_DEPENDENCIES = $(test_deps)
 
-check: check-am check-test
-check-test: all-am
+check-local:
        for bin in $(test_programs); do \
          if ! $(RUN_TEST) ./$$bin; then exit 1; fi; \
        done

diff --git a/src/lib-ldap/Makefile.am b/src/lib-ldap/Makefile.am
index 8fba6ae82ab08c3d50915da8580e519f8afeda57..14f53a6ba43b652ebfb037fcfd62c34a0af24c70 100644 (file)
--- a/src/lib-ldap/Makefile.am
+++ b/src/lib-ldap/Makefile.am
@@ -36,8 +36,7 @@ test_libs = \
        ../lib-ssl-iostream/libssl_iostream.la \
        ../lib/liblib.la
 
-check: check-am check-test
-check-test: all-am
+check-local:
        for bin in $(test_programs); do \
          if ! $(RUN_TEST) ./$$bin; then exit 1; fi; \
        done

diff --git a/src/lib-mail/Makefile.am b/src/lib-mail/Makefile.am
index 86368a3e8bc34993265c8db9d09acf9b326de24e..ba0cf0f091629216a49cc61d6cb3b0761210b20f 100644 (file)
--- a/src/lib-mail/Makefile.am
+++ b/src/lib-mail/Makefile.am
@@ -222,8 +222,7 @@ test_rfc822_parser_SOURCES = test-rfc822-parser.c
 test_rfc822_parser_LDADD = $(test_libs)
 test_rfc822_parser_DEPENDENCIES = $(test_deps)
 
-check: check-am check-test
-check-test: all-am
+check-local:
        for bin in $(test_programs); do \
          if ! $(RUN_TEST) ./$$bin; then exit 1; fi; \
        done

diff --git a/src/lib-master/Makefile.am b/src/lib-master/Makefile.am
index 7d68df37bf3e7932ed97e0d7eb00a38925f79e9b..24c613bcf46229fb74b2c52e55611c1efe71bbfb 100644 (file)
--- a/src/lib-master/Makefile.am
+++ b/src/lib-master/Makefile.am
@@ -64,8 +64,7 @@ test_master_service_settings_cache_SOURCES = test-master-service-settings-cache.
 test_master_service_settings_cache_LDADD = master-service-settings-cache.lo ../lib-settings/libsettings.la $(test_libs)
 test_master_service_settings_cache_DEPENDENCIES = $(test_deps) ../lib-settings/libsettings.la
 
-check: check-am check-test
-check-test: all-am
+check-local:
        for bin in $(test_programs); do \
          if ! $(RUN_TEST) ./$$bin; then exit 1; fi; \
        done

diff --git a/src/lib-program-client/Makefile.am b/src/lib-program-client/Makefile.am
index f4f5015981bb0fc83977aecbdcb3bad2d83d5f78..f7863ba5d9634214d6107c7fd49ee49b7f8b693c 100644 (file)
--- a/src/lib-program-client/Makefile.am
+++ b/src/lib-program-client/Makefile.am
@@ -45,8 +45,7 @@ test_program_client_unix_LDADD = $(test_libs)
 test_program_client_net_SOURCE = test-program-client-net.c
 test_program_client_net_LDADD = $(test_libs)
 
-check: check-am check-test
-check-test: all-am
+check-local:
        for bin in $(test_programs); do \
          if test "$$bin" = "test-program-client-local"; then \
            if ! env NOVALGRIND=yes $(RUN_TEST) ./$$bin; then exit 1; fi; \

diff --git a/src/lib-settings/Makefile.am b/src/lib-settings/Makefile.am
index 5434e32b567f4aa7f8f444b09366a7d29bd01776..7b868ba9c3551f332d5cc18b98fe8522f032f6e7 100644 (file)
--- a/src/lib-settings/Makefile.am
+++ b/src/lib-settings/Makefile.am
@@ -29,8 +29,7 @@ test_settings_parser_SOURCES = test-settings-parser.c
 test_settings_parser_LDADD = $(test_libs)
 test_settings_parser_DEPENDENCIES = $(test_libs)
 
-check: check-am check-test
-check-test: all-am
+check-local:
        for bin in $(test_programs); do \
          if ! $(RUN_TEST) ./$$bin; then exit 1; fi; \
        done

diff --git a/src/lib-smtp/Makefile.am b/src/lib-smtp/Makefile.am
index 376cb8957fa88c3c68daddc51904ada1be9f78bb..696f2bc8d0d6fce261e99c345a0069d0e4d6afeb 100644 (file)
--- a/src/lib-smtp/Makefile.am
+++ b/src/lib-smtp/Makefile.am
@@ -60,8 +60,7 @@ test_smtp_submit_LDFLAGS = -export-dynamic
 test_smtp_submit_LDADD = $(test_libs)
 test_smtp_submit_DEPENDENCIES = $(test_deps)
 
-check: check-am check-test
-check-test: all-am
+check-local:
        for bin in $(test_programs); do \
          if ! $(RUN_TEST) ./$$bin; then exit 1; fi; \
        done

diff --git a/src/lib-storage/Makefile.am b/src/lib-storage/Makefile.am
index e1b70018658ae7c30442587ee52ace9ba00e8c4e..256ceb7c4cdc6b50872f17c0fdb17b72a1c9ba1d 100644 (file)
--- a/src/lib-storage/Makefile.am
+++ b/src/lib-storage/Makefile.am
@@ -161,8 +161,7 @@ test_mail_storage_SOURCES = test-mail-storage.c
 test_mail_storage_LDADD = libstorage.la $(LIBDOVECOT)
 test_mail_storage_DEPENDENCIES = libstorage.la $(LIBDOVECOT_DEPS)
 
-check: check-am check-test
-check-test: all-am
+check-local:
        for bin in $(test_programs); do \
          if ! $(RUN_TEST) ./$$bin; then exit 1; fi; \
        done

diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 31577c078ae05002cb83ac5c28c204cee788599c..1cffc66ba65f9d3b8f2357858489b27cd484d2a0 100644 (file)
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -399,8 +399,7 @@ test_headers = \
 test_lib_LDADD = $(test_libs)
 test_lib_DEPENDENCIES = $(test_libs)
 
-check: check-am check-test
-check-test: all-am
+check-local:
        for bin in $(test_programs); do \
          if ! $(RUN_TEST) ./$$bin; then exit 1; fi; \
        done

diff --git a/src/plugins/mail-crypt/Makefile.am b/src/plugins/mail-crypt/Makefile.am
index f90f0e27703dd440cb246843317c0ca4cfbee3b5..942dc87894ef39c6bd3dd627cc59ee223a0792d3 100644 (file)
--- a/src/plugins/mail-crypt/Makefile.am
+++ b/src/plugins/mail-crypt/Makefile.am
@@ -108,8 +108,7 @@ noinst_HEADERS = \
        mail-crypt-key.h \
        fs-crypt-settings.h
 
-check: check-am check-test
-check-test: all-am
+check-local:
        for bin in $(test_programs); do \
          if ! env $(test_options) $(RUN_TEST) ./$$bin; then exit 1; fi; \
        done

diff --git a/src/plugins/pop3-migration/Makefile.am b/src/plugins/pop3-migration/Makefile.am
index 1c8750b4e5b490caee117b9bc6b46763c4ce10cc..f58d06532e562ddd1d9a0f19905fa6be226202b0 100644 (file)
--- a/src/plugins/pop3-migration/Makefile.am
+++ b/src/plugins/pop3-migration/Makefile.am
@@ -35,8 +35,7 @@ test_pop3_migration_plugin_SOURCES = test-pop3-migration-plugin.c
 test_pop3_migration_plugin_LDADD = pop3-migration-plugin.lo $(test_libs)
 test_pop3_migration_plugin_DEPENDENCIES = $(test_deps)
 
-check: check-am check-test
-check-test: all-am
+check-local:
        for bin in $(test_programs); do \
          if ! $(RUN_TEST) ./$$bin; then exit 1; fi; \
        done

diff --git a/src/plugins/quota/Makefile.am b/src/plugins/quota/Makefile.am
index e6bf7b488a4efcc4c7177491627bef74479c7e66..5a0e52fa921046f556adad3cacc515952f93633e 100644 (file)
--- a/src/plugins/quota/Makefile.am
+++ b/src/plugins/quota/Makefile.am
@@ -135,8 +135,7 @@ test_quota_util_SOURCES = test-quota-util.c
 test_quota_util_LDADD = quota-util.lo $(test_libs)
 test_quota_util_DEPENDENCIES = quota-util.lo $(test_deps)
 
-check: check-am check-test
-check-test: all-am
+check-local:
        for bin in $(test_programs); do \
          if ! $(RUN_TEST) ./$$bin; then exit 1; fi; \
        done

diff --git a/src/plugins/var-expand-crypt/Makefile.am b/src/plugins/var-expand-crypt/Makefile.am
index 9f4d73a42eb97131d1d9e2d8e4e6948293a6b8a4..6feb1a742d51711b8fa296e9a1b9de49a612e778 100644 (file)
--- a/src/plugins/var-expand-crypt/Makefile.am
+++ b/src/plugins/var-expand-crypt/Makefile.am
@@ -31,8 +31,7 @@ test_var_expand_crypt_LDADD = \
        ../../lib-dovecot/libdovecot.la \
        lib20_auth_var_expand_crypt.la
 
-check: check-am check-test
-check-test: all-am
+check-local:
        for bin in $(test_programs); do \
          if ! env $(test_options) $(RUN_TEST) ./$$bin; then exit 1; fi; \
        done