aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2017-01-23 20:14:32 +0000
committerWerner Koch <[email protected]>2017-01-23 20:14:32 +0000
commit25e029823813e190a18b601af60efcb1fb3b84af (patch)
treeb9a5f3828a9a077a778672521f749dc1fe47db24
parentpo: Auto update (diff)
downloadgnupg-25e029823813e190a18b601af60efcb1fb3b84af.tar.gz
gnupg-25e029823813e190a18b601af60efcb1fb3b84af.zip
build: Change make distcheck configure and temp. remove gpgconf.scm.
* Makefile.am (DISTCHECK_CONFIGURE_FLAGS): Also test gpgtar and wks-tools. Disable ntbtls. * tests/openpgp/Makefile.am (XTESTS): Temporary remove gpgconf.scm. Signed-off-by: Werner Koch <[email protected]>
Diffstat (limited to '')
-rw-r--r--Makefile.am2
-rw-r--r--tests/openpgp/Makefile.am5
2 files changed, 5 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am
index 735c72b64..e220f8b87 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,7 +20,7 @@
ACLOCAL_AMFLAGS = -I m4
DISTCHECK_CONFIGURE_FLAGS = --enable-symcryptrun --enable-g13 \
- --enable-gpg2-is-gpg
+ --enable-gpg2-is-gpg --enable-gpgtar --enable-wks-tools --disable-ntbtls
GITLOG_TO_CHANGELOG=gitlog-to-changelog
diff --git a/tests/openpgp/Makefile.am b/tests/openpgp/Makefile.am
index d1dd44914..05341fbfd 100644
--- a/tests/openpgp/Makefile.am
+++ b/tests/openpgp/Makefile.am
@@ -92,12 +92,15 @@ XTESTS = \
quick-key-manipulation.scm \
key-selection.scm \
delete-keys.scm \
- gpgconf.scm \
issue2015.scm \
issue2346.scm \
issue2417.scm \
issue2419.scm
+# Fixme: gpgconf.scm does not yet work with make distcheck.
+# gpgconf.scm
+
+
# XXX: Currently, one cannot override automake's 'check' target. As a
# workaround, we avoid defining 'TESTS', thus automake will not emit
# the 'check' target. For extra robustness, we merely define a