-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 On Mon 11 Mar 2013 01:03:52 PM EDT, Lukas Slebodnik wrote: > On (11/03/13 12:38), Stephen Gallagher wrote: >> -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 >> >> We were not properly detecting that cmocka was unavailable. It >> was expecting an empty value and getting "no" instead. This >> patch corrects the expectation, so we will now skip building and >> running cmocka tests on platforms that do not have it available. >> >> Also, the common_cmocka.h header was missing from the >> distribution tarball, causing 'make distcheck' to fail. >> >> >> >> >> >> Note: the nss cmocka test is consistently segfaulting for me >> during 'make distcheck' on F18 x86_64. I haven't had time to look >> into why, yet. It works fine in normal 'make check', so I suspect >> there's likely something going on with permissions (since 'make >> check' sets $libdir as read-only). But that's just a guess. > > Another solution to proper detection of libcmocka is attached in > my patch. I am not very familiar with autotools, so I am not sure > which solution is more suitable. >
Both are probably fine. I'm reattaching my patch though, as I accidentally sent the earlier one I had made that didn't have the Makefile.am fixes as well. I'm personally slightly in favor of setting the explicit default and testing for it (the way my patch does it) just because explicit values are easier to spot later if we're trying to track down misbehavior. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.13 (GNU/Linux) Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iEYEARECAAYFAlE+D6IACgkQeiVVYja6o6PARwCePMq8NGvGmk1N286WyO3YDA5M lc4AnjFk/U7BtpK4LdjxHgPBtBIF+szX =Iyau -----END PGP SIGNATURE-----
>From 32125b5218561e08feaad5fdb0d3155f12e96f5a Mon Sep 17 00:00:00 2001
From: Stephen Gallagher <sgall...@redhat.com>
Date: Mon, 11 Mar 2013 12:28:23 -0400
Subject: [PATCH] BUILD: Fix cmocka detection
We were not properly detecting that cmocka was unavailable. It was
expecting an empty value and getting "no" instead. This patch
corrects the expectation, so we will now skip building and running
cmocka tests on platforms that do not have it available.
Also, we were missing the cmocka header files in the distribution
tarball, so 'make distcheck' was failing.
---
Makefile.am | 2 ++
configure.ac | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/Makefile.am b/Makefile.am
index 62999e774741f1f1d70cc7b9c8d6ea9bc1c49ad2..0554a3670d1d845573124b70907ae7103ee45b89 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -461,6 +461,8 @@ dist_noinst_HEADERS = \
src/resolv/ares/ares_parse_txt_reply.h \
src/resolv/ares/ares_data.h \
src/tests/common.h \
+ src/tests/cmocka/common_mock.h \
+ src/tests/cmocka/common_mock_resp.h \
src/sss_client/ssh/sss_ssh_client.h \
src/lib/idmap/sss_idmap_private.h
diff --git a/configure.ac b/configure.ac
index 0e7712389d99cf1b903ae1dbf063d889be62d7b0..4b1cfba26166bbe407ce219d8ad86e8b1a94c88b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -270,7 +270,7 @@ AC_PATH_PROG([DOXYGEN], [doxygen], [false])
AM_CONDITIONAL([HAVE_DOXYGEN], [test x$DOXYGEN != xfalse ])
AM_CONDITIONAL([HAVE_CHECK], [test x$have_check != x])
-AM_CONDITIONAL([HAVE_CMOCKA], [test x$have_cmocka != x])
+AM_CONDITIONAL([HAVE_CMOCKA], [test x$have_cmocka = xyes])
abs_build_dir=`pwd`
AC_DEFINE_UNQUOTED([ABS_BUILD_DIR], ["$abs_build_dir"], [Absolute path to the build directory])
--
1.8.1.4
0001-BUILD-Fix-cmocka-detection.patch.sig
Description: PGP signature
_______________________________________________ sssd-devel mailing list sssd-devel@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/sssd-devel
