[git] GnuPG - branch, master, updated. gnupg-2.1.15-36-gbabeb6f

[by Werner Koch]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GNU Privacy Guard".

The branch, master has been updated
       via  babeb6f8a9b1f8341652145bad58be6cd49e0712 (commit)
      from  04c042f3f2a631bc6e772c33f8da5e7aa7b1902a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit babeb6f8a9b1f8341652145bad58be6cd49e0712
Author: Werner Koch <wk at gnupg.org>
Date:   Thu Sep 1 11:18:10 2016 +0200

    tests: Run test requiring the network only in maintainer-mode.
    
    * dirmngr/Makefile.am (noinst_PROGRAMS, TESTS): Add module_net_tests.
    (module_tests): Move t-dns-test to ...
    (module_net_tests): here.
    --
    
    Debian-bug-id: 836259
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/dirmngr/Makefile.am b/dirmngr/Makefile.am
index 64bc058..6b0a1e1 100644
--- a/dirmngr/Makefile.am
+++ b/dirmngr/Makefile.am
@@ -28,8 +28,8 @@ if USE_LDAPWRAPPER
 libexec_PROGRAMS = dirmngr_ldap
 endif
 
-noinst_PROGRAMS = $(module_tests) $(module_maint_tests)
-TESTS = $(module_tests)
+noinst_PROGRAMS = $(module_tests) $(module_net_tests) $(module_maint_tests)
+TESTS = $(module_tests) $(module_net_tests)
 
 AM_CPPFLAGS = -I$(top_srcdir)/common
 
@@ -114,12 +114,20 @@ t_common_ldadd = $(libcommon) $(LIBASSUAN_LIBS) $(LIBGCRYPT_LIBS) \
                  $(NTBTLS_LIBS) $(LIBGNUTLS_LIBS) \
                  $(DNSLIBS) $(LIBINTL) $(LIBICONV)
 
-module_tests = t-dns-stuff
+module_tests =
 
 if USE_LDAP
 module_tests += t-ldap-parse-uri
 endif
 
+# Test which need a network connections are only used in maintainer mode.
+if MAINTAINER_MODE
+module_net_tests = t-dns-stuff
+else
+module_net_tests =
+endif
+
+# Tests which are only for manually testing are only build in maintainer-mode.
 if MAINTAINER_MODE
 module_maint_tests = t-http
 else

-----------------------------------------------------------------------

Summary of changes:
 dirmngr/Makefile.am | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
The GNU Privacy Guard
http://git.gnupg.org