From ba0d168d93ece03f4d446685cdb505b7ee038c35 Mon Sep 17 00:00:00 2001
From: Jakub Hrozek <jhrozek@redhat.com>
Date: Fri, 30 May 2014 10:33:43 +0200
Subject: BUILD: Disable dbus tests when running distcheck

https://fedorahosted.org/sssd/ticket/2291

The dbus tests that mock an sbus server were failing when make distcheck
was ran by a user logged in through the SSSD.

The reason was that the libtool wrapper around the test library alters
the LD_LIBRARY_PATH and as a consequence, the standard getpwuid_r() calls
the dbus server performs would load the in-tree NSS library and not the
system one.  The-in tree library would then attempt to talk to an in-tree
NSS socket, fail, which would fail the getpwuid_r call with an error such as:

"""
    Could not get password database information for UID of current process:
    User "???" unknown or no memory to allocate password entry
"""

This patch adds a new configure-time option called --enable-dbus-tests
that is enabled by default and disabled during distcheck. When the
option is disabled, the tests that require a mocked dbus server are not
compiled at all.

(cherry picked from commit 4bd20c075f0f187db0181dc53d00ab6cd47fdb4d)

Conflicts:
	Makefile.am
	src/conf_macros.m4
---
 Makefile.am | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

(limited to 'Makefile.am')

diff --git a/Makefile.am b/Makefile.am
index 7f44a52c1..66150e4db 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,6 +4,7 @@ if HAVE_DEVSHM
 endif
 
 AM_DISTCHECK_CONFIGURE_FLAGS = --with-ldb-lib-dir="$$dc_install_base"/lib/ldb \
+                               --disable-dbus-tests \
                                --enable-all-experimental-features \
                                $(extra_distcheck_flags)
 
@@ -138,15 +139,19 @@ if HAVE_CHECK
         debug-tests \
         ipa_hbac-tests \
         sss_idmap-tests \
-        responder_socket_access-tests \
-        sbus_tests \
-        sbus_codegen_tests
+        responder_socket_access-tests
 
 if BUILD_SSH
     non_interactive_check_based_tests += sysdb_ssh-tests
 endif
 
-endif
+if BUILD_DBUS_TESTS
+    non_interactive_check_based_tests += \
+	sbus_tests \
+	sbus_codegen_tests
+endif # BUILD_DBUS_TESTS
+
+endif # HAVE_CHECK
 
 if HAVE_CMOCKA
     non_interactive_cmocka_based_tests = \
@@ -1346,6 +1351,8 @@ krb5_child_test_LDADD = \
     $(SSSD_INTERNAL_LTLIBS) \
     libsss_test_common.la
 
+if BUILD_DBUS_TESTS
+
 sbus_tests_SOURCES = \
    src/tests/common_dbus.c \
    src/tests/sbus_tests.c
@@ -1368,6 +1375,8 @@ sbus_codegen_tests_LDADD = \
     $(SSSD_LIBS) \
     $(CHECK_LIBS)
 
+endif # BUILD_DBUS_TESTS
+
 if HAVE_CMOCKA
 
 TEST_MOCK_RESP_OBJ = \
-- 
cgit