[Pkg-gnupg-commit] [gnupg2] 01/03: Avoid network access during tests (Closes: #836259)

[Daniel Kahn Gillmor]

This is an automated email from the git hooks/post-receive script.

dkg pushed a commit to branch master
in repository gnupg2.

commit fe5f50c59f1365733314fb178161a4bcc231afc9
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date:   Mon Sep 5 19:28:50 2016 -0400

    Avoid network access during tests (Closes: #836259)
    
    This is a cherry-pick of upstream commit
    babeb6f8a9b1f8341652145bad58be6cd49e0712
---
 ...est-requiring-the-network-only-in-maintai.patch | 52 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 53 insertions(+)

diff --git a/debian/patches/0007-tests-Run-test-requiring-the-network-only-in-maintai.patch b/debian/patches/0007-tests-Run-test-requiring-the-network-only-in-maintai.patch
new file mode 100644
index 0000000..9d53533
--- /dev/null
+++ b/debian/patches/0007-tests-Run-test-requiring-the-network-only-in-maintai.patch
@@ -0,0 +1,52 @@
+From: Werner Koch <wk at gnupg.org>
+Date: Thu, 1 Sep 2016 11:18:10 +0200
+Subject: 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>
+---
+ dirmngr/Makefile.am | 14 +++++++++++---
+ 1 file changed, 11 insertions(+), 3 deletions(-)
+
+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
diff --git a/debian/patches/series b/debian/patches/series
index 6f96c5b..57f00aa 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@
 0004-spelling-s-achived-achieved-and-s-alternativly-alter.patch
 0005-gpg-Fix-regression-in-gpgv-s-printing-of-the-keyid.patch
 0006-gpg-Avoid-homedir-creation-by-list-config.patch
+0007-tests-Run-test-requiring-the-network-only-in-maintai.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gnupg2.git