|
 |
5fca41 |
From 861a45d9a866e5a9d87eaad8b8b9734eb6bc59aa Mon Sep 17 00:00:00 2001
|
|
|
5fca41 |
From: Alexey Tikhonov <atikhono@redhat.com>
|
|
|
5fca41 |
Date: Fri, 22 Mar 2019 16:33:14 +0100
|
|
|
5fca41 |
Subject: [PATCH 14/15] TESTS: moved cwrap/test_negcache to cmocka tests
|
|
|
5fca41 |
|
|
|
5fca41 |
Moved cwrap/test_negcache.c to cmocka tests since it doesn't use
|
|
|
5fca41 |
cwrap tools anymore.
|
|
|
5fca41 |
|
|
|
5fca41 |
Reviewed-by: Jakub Hrozek <jhrozek@redhat.com>
|
|
|
5fca41 |
(cherry picked from commit 137b684d0a01afa02618b07ba46a44dad017b5b9)
|
|
|
5fca41 |
|
|
|
5fca41 |
Reviewed-by: Jakub Hrozek <jhrozek@redhat.com>
|
|
|
5fca41 |
---
|
|
|
5fca41 |
Makefile.am | 19 +++++++++
|
|
|
5fca41 |
.../test_negcache_2.c} | 0
|
|
|
5fca41 |
src/tests/cwrap/Makefile.am | 40 -------------------
|
|
|
5fca41 |
3 files changed, 19 insertions(+), 40 deletions(-)
|
|
|
5fca41 |
rename src/tests/{cwrap/test_negcache.c => cmocka/test_negcache_2.c} (100%)
|
|
|
5fca41 |
|
|
|
5fca41 |
diff --git a/Makefile.am b/Makefile.am
|
|
|
5fca41 |
index 6a67dc7b1..d09f50aa2 100644
|
|
|
5fca41 |
--- a/Makefile.am
|
|
|
5fca41 |
+++ b/Makefile.am
|
|
|
5fca41 |
@@ -239,6 +239,7 @@ if HAVE_CMOCKA
|
|
|
5fca41 |
test-find-uid \
|
|
|
5fca41 |
test-io \
|
|
|
5fca41 |
test-negcache \
|
|
|
5fca41 |
+ negcache_2-tests \
|
|
|
5fca41 |
test-authtok \
|
|
|
5fca41 |
sss_nss_idmap-tests \
|
|
|
5fca41 |
deskprofile_utils-tests \
|
|
|
5fca41 |
@@ -2603,6 +2604,24 @@ test_negcache_LDADD = \
|
|
|
5fca41 |
libsss_test_common.la \
|
|
|
5fca41 |
libsss_idmap.la
|
|
|
5fca41 |
|
|
|
5fca41 |
+negcache_2_tests_SOURCES =\
|
|
|
5fca41 |
+ $(SSSD_RESPONDER_OBJ) \
|
|
|
5fca41 |
+ src/tests/cmocka/test_negcache_2.c \
|
|
|
5fca41 |
+ $(NULL)
|
|
|
5fca41 |
+negcache_2_tests_CFLAGS = \
|
|
|
5fca41 |
+ $(AM_CFLAGS) \
|
|
|
5fca41 |
+ -DBASE_FILE_STEM=\"$(*F)\" \
|
|
|
5fca41 |
+ $(NULL)
|
|
|
5fca41 |
+negcache_2_tests_LDADD = \
|
|
|
5fca41 |
+ $(LIBADD_DL) \
|
|
|
5fca41 |
+ $(CMOCKA_LIBS) \
|
|
|
5fca41 |
+ $(SSSD_LIBS) \
|
|
|
5fca41 |
+ $(SYSTEMD_DAEMON_LIBS) \
|
|
|
5fca41 |
+ libsss_util.la \
|
|
|
5fca41 |
+ libsss_test_common.la \
|
|
|
5fca41 |
+ libsss_debug.la \
|
|
|
5fca41 |
+ $(NULL)
|
|
|
5fca41 |
+
|
|
|
5fca41 |
test_authtok_SOURCES = \
|
|
|
5fca41 |
src/tests/cmocka/test_authtok.c \
|
|
|
5fca41 |
src/util/authtok.c \
|
|
|
5fca41 |
diff --git a/src/tests/cwrap/test_negcache.c b/src/tests/cmocka/test_negcache_2.c
|
|
|
5fca41 |
similarity index 100%
|
|
|
5fca41 |
rename from src/tests/cwrap/test_negcache.c
|
|
|
5fca41 |
rename to src/tests/cmocka/test_negcache_2.c
|
|
|
5fca41 |
diff --git a/src/tests/cwrap/Makefile.am b/src/tests/cwrap/Makefile.am
|
|
|
5fca41 |
index bfc493395..1edefc678 100644
|
|
|
5fca41 |
--- a/src/tests/cwrap/Makefile.am
|
|
|
5fca41 |
+++ b/src/tests/cwrap/Makefile.am
|
|
|
5fca41 |
@@ -73,26 +73,6 @@ SSSD_RESPONDER_IFACE_OBJ = \
|
|
|
5fca41 |
../../../src/responder/common/iface/responder_iface_generated.c \
|
|
|
5fca41 |
$(NULL)
|
|
|
5fca41 |
|
|
|
5fca41 |
-SSSD_RESPONDER_OBJ = \
|
|
|
5fca41 |
- ../../../src/responder/common/negcache_files.c \
|
|
|
5fca41 |
- ../../../src/util/nss_dl_load.c \
|
|
|
5fca41 |
- ../../../src/responder/common/negcache.c \
|
|
|
5fca41 |
- ../../../src/responder/common/responder_cmd.c \
|
|
|
5fca41 |
- ../../../src/responder/common/responder_common.c \
|
|
|
5fca41 |
- ../../../src/responder/common/responder_dp.c \
|
|
|
5fca41 |
- ../../../src/responder/common/responder_dp_ssh.c \
|
|
|
5fca41 |
- ../../../src/responder/common/responder_packet.c \
|
|
|
5fca41 |
- ../../../src/responder/common/responder_get_domains.c \
|
|
|
5fca41 |
- ../../../src/responder/common/responder_utils.c \
|
|
|
5fca41 |
- ../../../src/responder/common/data_provider/rdp_message.c \
|
|
|
5fca41 |
- ../../../src/responder/common/data_provider/rdp_client.c \
|
|
|
5fca41 |
- ../../../src/monitor/monitor_iface_generated.c \
|
|
|
5fca41 |
- ../../../src/providers/data_provider_req.c \
|
|
|
5fca41 |
- ../../../src/util/session_recording.c \
|
|
|
5fca41 |
- $(SSSD_RESPONDER_IFACE_OBJ) \
|
|
|
5fca41 |
- $(SSSD_CACHE_REQ_OBJ) \
|
|
|
5fca41 |
- $(NULL)
|
|
|
5fca41 |
-
|
|
|
5fca41 |
dist_noinst_DATA = \
|
|
|
5fca41 |
group \
|
|
|
5fca41 |
passwd \
|
|
|
5fca41 |
@@ -107,7 +87,6 @@ check_PROGRAMS += \
|
|
|
5fca41 |
server-tests \
|
|
|
5fca41 |
usertools-tests \
|
|
|
5fca41 |
responder_common-tests \
|
|
|
5fca41 |
- negcache-tests \
|
|
|
5fca41 |
$(NULL)
|
|
|
5fca41 |
endif # HAVE_UID_WRAPPER
|
|
|
5fca41 |
endif # HAVE_NSS_WRAPPER
|
|
|
5fca41 |
@@ -201,23 +180,4 @@ responder_common_tests_LDADD = \
|
|
|
5fca41 |
$(abs_top_builddir)/libsss_test_common.la \
|
|
|
5fca41 |
$(NULL)
|
|
|
5fca41 |
|
|
|
5fca41 |
-negcache_tests_SOURCES =\
|
|
|
5fca41 |
- $(SSSD_RESPONDER_OBJ) \
|
|
|
5fca41 |
- test_negcache.c \
|
|
|
5fca41 |
- $(NULL)
|
|
|
5fca41 |
-negcache_tests_CFLAGS = \
|
|
|
5fca41 |
- $(AM_CFLAGS) \
|
|
|
5fca41 |
- -DBASE_FILE_STEM=\"$(*F)\" \
|
|
|
5fca41 |
- $(NULL)
|
|
|
5fca41 |
-negcache_tests_LDADD = \
|
|
|
5fca41 |
- $(LIBADD_DL) \
|
|
|
5fca41 |
- $(CMOCKA_LIBS) \
|
|
|
5fca41 |
- $(SSSD_LIBS) \
|
|
|
5fca41 |
- $(SELINUX_LIBS) \
|
|
|
5fca41 |
- $(SYSTEMD_DAEMON_LIBS) \
|
|
|
5fca41 |
- $(abs_top_builddir)/libsss_util.la \
|
|
|
5fca41 |
- $(abs_top_builddir)/libsss_debug.la \
|
|
|
5fca41 |
- $(abs_top_builddir)/libsss_test_common.la \
|
|
|
5fca41 |
- $(NULL)
|
|
|
5fca41 |
-
|
|
|
5fca41 |
tests: $(check_PROGRAMS)
|
|
|
5fca41 |
--
|
|
|
5fca41 |
2.19.1
|
|
|
5fca41 |
|