summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Josefsson <simon@josefsson.org>2008-06-15 23:08:06 +0200
committerSimon Josefsson <simon@josefsson.org>2008-06-15 23:08:06 +0200
commit888126d257e05ce3794382c9b87a766922e0e93f (patch)
tree0a7f2f6329e1ecaa073844258f3de8b3b58c9588
parent56294059b478b45c20abf53f0e4bd264b67cc150 (diff)
downloadgnutls-888126d257e05ce3794382c9b87a766922e0e93f.tar.gz
Disable openpgp-certs properly.
-rw-r--r--tests/Makefile.am4
-rw-r--r--tests/openpgp-certs/Makefile.am9
2 files changed, 7 insertions, 6 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 88ecbe6f0b..4684ec5066 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -23,9 +23,7 @@ SUBDIRS = rsa-md5-collision pkcs1-padding pkcs8-decode pkcs12-decode \
userid pathlen key-id sha2 hostname-check
if ENABLE_OPENPGP
-SUBDIRS += openpgp
-# The 'openpgp-certs' sub-directory is disabled until we can make it
-# work under Wine and under Debian buildds (problem with 127.0.0.2?).
+SUBDIRS += openpgp openpgp-certs
endif
EXTRA_DIST = libgcrypt.supp
diff --git a/tests/openpgp-certs/Makefile.am b/tests/openpgp-certs/Makefile.am
index 8504623128..d437dc51be 100644
--- a/tests/openpgp-certs/Makefile.am
+++ b/tests/openpgp-certs/Makefile.am
@@ -19,12 +19,15 @@
if ENABLE_OPENPGP
-dist_check_SCRIPTS = testcerts
-
EXTRA_DIST = ca-public.gpg srv-public-all-signed.gpg srv-secret.gpg \
ca-secret.gpg srv-public.gpg srv-public-127.0.0.1-signed.gpg \
srv-public-localhost-signed.gpg
-TESTS = testcerts
+# The selftest is disabled until we can make it work under Wine and
+# under Debian buildds (problem with 127.0.0.2?). Just extra-dist it
+# for now.
+EXTRA_DIST += testcerts
+#dist_check_SCRIPTS = testcerts
+#TESTS = testcerts
endif