diff options
| author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2016-05-03 20:10:57 +0200 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2016-05-03 20:10:57 +0200 |
| commit | a9032bd5bdb77a440e9b0897c09498b199b79d1f (patch) | |
| tree | 3f3ce6cb34104ea6e6c4770d0eb3a16ec7150f90 | |
| parent | ae40598e5597b1b1f01a7e55d35b5f476d7d19d7 (diff) | |
| download | gnutls-a9032bd5bdb77a440e9b0897c09498b199b79d1f.tar.gz | |
tests: don't run pkcs11 mock module tests under buggy p11-kit
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | tests/Makefile.am | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index 7349a521e3..b9998c2424 100644 --- a/configure.ac +++ b/configure.ac @@ -441,6 +441,9 @@ if test "$with_p11_kit" != "no"; then else GNUTLS_REQUIRES_PRIVATE="${GNUTLS_REQUIRES_PRIVATE}, p11-kit-1" fi + if ! $PKG_CONFIG --atleast-version=0.22.0 p11-kit-1; then + with_buggy_p11_kit=yes + fi else with_p11_kit=no AC_MSG_WARN([[ @@ -452,6 +455,7 @@ if test "$with_p11_kit" != "no"; then fi AM_CONDITIONAL(ENABLE_PKCS11, test "$with_p11_kit" != "no") +AM_CONDITIONAL(HAVE_BUGGY_P11_KIT, test "$with_buggy_p11_kit" = "yes") AC_ARG_WITH(tpm, AS_HELP_STRING([--without-tpm], diff --git a/tests/Makefile.am b/tests/Makefile.am index 45a74ce277..e272751eb8 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -92,6 +92,7 @@ ctests = mini-record-2 simple gc set_pkcs12_cred certder certuniqueid \ version-checks if ENABLE_PKCS11 +if !HAVE_BUGGY_P11_KIT if !WINDOWS pkglib_LTLIBRARIES += libpkcs11mock1.la libpkcs11mock1_la_SOURCES = pkcs11/pkcs11-mock.c pkcs11/pkcs11-mock.h @@ -110,6 +111,7 @@ pkcs11_get_raw_issuer_exts_DEPENDENCIES = libpkcs11mock1.la libutils.la ctests += pkcs11-cert-import-url-exts pkcs11-get-exts pkcs11-get-raw-issuer-exts endif endif +endif if ENABLE_OCSP ctests += ocsp |