[SSSD] [PATCH] BUILD: link dp tests with LDB directly to fix builds on Debian

Lukas Slebodnik lslebodn at redhat.com
Wed Sep 23 14:30:13 UTC 2015


On (23/09/15 06:40), Lukas Slebodnik wrote:
>On (22/09/15 13:42), Jakub Hrozek wrote:
>>On Tue, Sep 22, 2015 at 11:21:33AM +0200, Pavel Březina wrote:
>>> On 09/22/2015 10:36 AM, Jakub Hrozek wrote:
>>> >Hi,
>>> >
>>> >one of my recent patches broke test builds on Debian. The attached patch
>>> >fixes it:
>>> >     http://sssd-ci.duckdns.org/logs/job/27/41/summary.html
>>> 
>>> CI fails without the patch, pass with it. Ack.
>>
>>Thanks for the quick review:
>>    2ddacb7212cbc9a250c253330eec87f67e139eb4
>Even though it is little bit late here is an alternative/simpler version :-)
>
>LS

>From 99638eddc1f4514eb8a5a0d7ce0cdfa7e7d5536c Mon Sep 17 00:00:00 2001
>From: Lukas Slebodnik <lslebodn at redhat.com>
>Date: Tue, 22 Sep 2015 22:06:37 +0200
>Subject: [PATCH 1/5] BUILD: Simplify build of test_data_provider_be
>
>It's an alternative solution for
>https://fedorahosted.org/sssd/ticket/2799
>---
> Makefile.am | 11 +++--------
> 1 file changed, 3 insertions(+), 8 deletions(-)
>
>diff --git a/Makefile.am b/Makefile.am
>index 2d704fd393eef8fb28312ceb699e8ec48267ccf3..464ba365cc4ec8d53e211e53f8223818538252f5 100644
>--- a/Makefile.am
>+++ b/Makefile.am
>@@ -2580,29 +2580,24 @@ test_cert_utils_LDADD = \
>     $(NULL)
> 
> test_data_provider_be_SOURCES = \
>-    $(sssd_be_SOURCES) \
>+    src/providers/data_provider_be.c \
>     src/tests/cmocka/test_data_provider_be.c \
>     src/tests/cmocka/common_mock_be.c \
>     $(NULL)
> test_data_provider_be_CFLAGS = \
>     $(AM_CFLAGS) \
>     -DUNIT_TESTING \
>-    $(CRYPTO_CFLAGS) \
>     $(NULL)
> test_data_provider_be_LDFLAGS = \
>     -Wl,-wrap,_tevent_add_timer \
>     $(NULL)
> test_data_provider_be_LDADD = \
>     $(CMOCKA_LIBS) \
>-    $(CARES_LIBS) \
>-    $(POPT_LIBS) \
>     $(PAM_LIBS) \
>-    $(TALLOC_LIBS) \
>-    $(LDB_LIBS) \
>-    $(DBUS_LIBS) \
>+    $(SSSD_LIBS) \
>     $(SSSD_INTERNAL_LTLIBS) \
>-    libsss_debug.la \
>     libsss_test_common.la \
>+    libdlopen_test_providers.la \
>     $(NULL)
> 
> endif # HAVE_CMOCKA
>-- 
>2.5.0
>

>From 507ce00d0d677f28d8d51bf10d453669f83bd9c9 Mon Sep 17 00:00:00 2001
>From: Lukas Slebodnik <lslebodn at redhat.com>
>Date: Mon, 21 Sep 2015 16:26:10 +0200
>Subject: [PATCH 2/5] BUILD: Remove unused variable CHECK_OBJ
>
>---
> Makefile.am | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
>diff --git a/Makefile.am b/Makefile.am
>index 464ba365cc4ec8d53e211e53f8223818538252f5..c8d8bf2e0ecffb2b7260fa859abe8a7490a7e225 100644
>--- a/Makefile.am
>+++ b/Makefile.am
>@@ -1578,7 +1578,7 @@ resolv_tests_LDADD = \
> 
> refcount_tests_SOURCES = \
>     src/tests/refcount-tests.c \
>-    $(CHECK_OBJ)
>+    $(NULL)
> refcount_tests_CFLAGS = \
>     $(CHECK_CFLAGS)
> refcount_tests_LDADD = \
>@@ -1590,7 +1590,7 @@ refcount_tests_LDADD = \
> fail_over_tests_SOURCES = \
>     src/tests/fail_over-tests.c \
>     $(SSSD_FAILOVER_OBJ) \
>-    $(CHECK_OBJ)
>+    $(NULLL)
There is a typo
s/NULLL/NULL/

Updated version is attached.

LS
-------------- next part --------------
>From 99638eddc1f4514eb8a5a0d7ce0cdfa7e7d5536c Mon Sep 17 00:00:00 2001
From: Lukas Slebodnik <lslebodn at redhat.com>
Date: Tue, 22 Sep 2015 22:06:37 +0200
Subject: [PATCH 1/5] BUILD: Simplify build of test_data_provider_be

It's an alternative solution for
https://fedorahosted.org/sssd/ticket/2799
---
 Makefile.am | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 2d704fd393eef8fb28312ceb699e8ec48267ccf3..464ba365cc4ec8d53e211e53f8223818538252f5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2580,29 +2580,24 @@ test_cert_utils_LDADD = \
     $(NULL)
 
 test_data_provider_be_SOURCES = \
-    $(sssd_be_SOURCES) \
+    src/providers/data_provider_be.c \
     src/tests/cmocka/test_data_provider_be.c \
     src/tests/cmocka/common_mock_be.c \
     $(NULL)
 test_data_provider_be_CFLAGS = \
     $(AM_CFLAGS) \
     -DUNIT_TESTING \
-    $(CRYPTO_CFLAGS) \
     $(NULL)
 test_data_provider_be_LDFLAGS = \
     -Wl,-wrap,_tevent_add_timer \
     $(NULL)
 test_data_provider_be_LDADD = \
     $(CMOCKA_LIBS) \
-    $(CARES_LIBS) \
-    $(POPT_LIBS) \
     $(PAM_LIBS) \
-    $(TALLOC_LIBS) \
-    $(LDB_LIBS) \
-    $(DBUS_LIBS) \
+    $(SSSD_LIBS) \
     $(SSSD_INTERNAL_LTLIBS) \
-    libsss_debug.la \
     libsss_test_common.la \
+    libdlopen_test_providers.la \
     $(NULL)
 
 endif # HAVE_CMOCKA
-- 
2.5.0

-------------- next part --------------
>From 834f453db6c1bdaaa0d18c01bb9af927b9dac24e Mon Sep 17 00:00:00 2001
From: Lukas Slebodnik <lslebodn at redhat.com>
Date: Mon, 21 Sep 2015 16:26:10 +0200
Subject: [PATCH 2/5] BUILD: Remove unused variable CHECK_OBJ

---
 Makefile.am | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 464ba365cc4ec8d53e211e53f8223818538252f5..ba975aa03f135c5d387e485bab17b2a88baba30a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1578,7 +1578,7 @@ resolv_tests_LDADD = \
 
 refcount_tests_SOURCES = \
     src/tests/refcount-tests.c \
-    $(CHECK_OBJ)
+    $(NULL)
 refcount_tests_CFLAGS = \
     $(CHECK_CFLAGS)
 refcount_tests_LDADD = \
@@ -1590,7 +1590,7 @@ refcount_tests_LDADD = \
 fail_over_tests_SOURCES = \
     src/tests/fail_over-tests.c \
     $(SSSD_FAILOVER_OBJ) \
-    $(CHECK_OBJ)
+    $(NULL)
 fail_over_tests_CFLAGS = \
     $(CHECK_CFLAGS)
 fail_over_tests_LDADD = \
-- 
2.5.0



More information about the sssd-devel mailing list