[Pkg-gnupg-commit] [gnupg2] 01/01: disable gpgtar, since it is causing unpredictable testsuite failures and we don't ship it anyway.

[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 0e5e52cb1c72e9921bd340bdfbf89f78adf0a098
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date:   Thu Feb 4 15:51:27 2016 -0500

    disable gpgtar, since it is causing unpredictable testsuite failures and we don't ship it anyway.
---
 debian/changelog                                   |  7 +++++
 ...ar.test-when-disable-gpgtar-is-configured.patch | 35 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 debian/rules                                       |  1 +
 4 files changed, 44 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 704f78b..c062f7c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+gnupg2 (2.1.11-4) unstable; urgency=medium
+
+  * disable gpgtar, since it is causing unpredictable testsuite failures
+    and we don't ship it anyway.
+
+ -- Daniel Kahn Gillmor <dkg at fifthhorseman.net>  Wed, 03 Feb 2016 11:57:57 -0500
+
 gnupg2 (2.1.11-3) unstable; urgency=medium
 
   * trying again to get a proper dump of the gpgtar.test.log. sigh.
diff --git a/debian/patches/0004-avoid-gpgtar.test-when-disable-gpgtar-is-configured.patch b/debian/patches/0004-avoid-gpgtar.test-when-disable-gpgtar-is-configured.patch
new file mode 100644
index 0000000..a77ce17
--- /dev/null
+++ b/debian/patches/0004-avoid-gpgtar.test-when-disable-gpgtar-is-configured.patch
@@ -0,0 +1,35 @@
+From: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
+Date: Thu, 4 Feb 2016 15:59:28 -0500
+Subject: avoid gpgtar.test when --disable-gpgtar is configured
+
+---
+ tests/openpgp/Makefile.am | 9 ++++++++-
+ 1 file changed, 8 insertions(+), 1 deletion(-)
+
+diff --git a/tests/openpgp/Makefile.am b/tests/openpgp/Makefile.am
+index a04b62c..92b4097 100644
+--- a/tests/openpgp/Makefile.am
++++ b/tests/openpgp/Makefile.am
+@@ -31,6 +31,13 @@ else
+ sqlite3_dependent_tests =
+ endif
+ 
++if BUILD_GPGTAR
++gpgtar_tests = gpgtar.test
++else
++gpgtar_tests =
++endif
++
++
+ # Note: version.test needs to be the first test to run and finish.test
+ # the last one
+ TESTS = version.test mds.test \
+@@ -46,7 +53,7 @@ TESTS = version.test mds.test \
+ 	multisig.test verify.test armor.test \
+ 	import.test ecc.test 4gb-packet.test \
+ 	$(sqlite3_dependent_tests) \
+-	gpgtar.test use-exact-key.test default-key.test \
++	$(gpgtar_tests) use-exact-key.test default-key.test \
+ 	finish.test
+ 
+ 
diff --git a/debian/patches/series b/debian/patches/series
index cafe59a..36e1393 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 0001-rename-gnupg2.patch
 0002-avoid-beta-warning.patch
 0003-Avoid-simple-memory-dumps-via-ptrace.patch
+0004-avoid-gpgtar.test-when-disable-gpgtar-is-configured.patch
diff --git a/debian/rules b/debian/rules
index 74c4667..944d684 100755
--- a/debian/rules
+++ b/debian/rules
@@ -25,6 +25,7 @@ endif
 
 override_dh_auto_configure:
 	dh_auto_configure -- --libexecdir=\$${prefix}/lib/gnupg2 \
+		--disable-gpgtar \
 		--enable-symcryptrun --enable-large-secmem
 
 override_dh_shlibdeps:

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