summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLukas Slebodnik <lslebodn@redhat.com>2013-05-22 08:50:29 +0200
committerJakub Hrozek <jhrozek@redhat.com>2013-05-30 13:37:55 +0200
commitd65f692d7b7639ed8ba0f5cffa4f88b68056739a (patch)
tree694591146b2916df9a9a8871e16cc138ecd14ac6
parent2338eef6ec830dcbbc7e9f7bcebf31656e8742ec (diff)
downloadsssd-d65f692d7b7639ed8ba0f5cffa4f88b68056739a.tar.gz
sssd-d65f692d7b7639ed8ba0f5cffa4f88b68056739a.tar.bz2
sssd-d65f692d7b7639ed8ba0f5cffa4f88b68056739a.zip
Making order in tests.
--removed duplicated test-io --reusing library libsss_test_common in other tests --cmocka test sss_nss_idmap-tests was moved to cmocka dir --moved leak_check.c to libsss_test_common --moved common_tev.c,common_dom.c to libsss_test_common (leak_check.c,common_tev.c,common_dom.c) are test framework independent
-rw-r--r--Makefile.am34
-rw-r--r--src/tests/cmocka/sss_nss_idmap-tests.c (renamed from src/tests/sss_nss_idmap-tests.c)0
-rw-r--r--src/tests/leak_check.c1
3 files changed, 14 insertions, 21 deletions
diff --git a/Makefile.am b/Makefile.am
index 2bcb7145..250f9b67 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -150,7 +150,6 @@ if HAVE_CMOCKA
test-find-uid \
test-io \
sss_nss_idmap-tests \
- test-io \
dyndns-tests
endif
@@ -869,12 +868,14 @@ noinst_LTLIBRARIES += \
libsss_test_common.la
libsss_test_common_la_SOURCES = \
+ src/tests/common_tev.c \
+ src/tests/common_dom.c \
+ src/tests/leak_check.c \
src/tests/common.c
if HAVE_CHECK
libsss_test_common_la_SOURCES += \
- src/tests/common_check.c \
- src/tests/leak_check.c
+ src/tests/common_check.c
sysdb_tests_DEPENDENCIES = \
$(ldblib_LTLIBRARIES)
@@ -1149,14 +1150,6 @@ sss_idmap_tests_LDADD = \
libsss_test_common.la \
libsss_idmap.la
-sss_nss_idmap_tests_SOURCES = \
- src/tests/sss_nss_idmap-tests.c
-sss_nss_idmap_tests_CFLAGS = \
- $(AM_CFLAGS)
-sss_nss_idmap_tests_LDADD = \
- $(CMOCKA_LIBS) \
- libsss_nss_idmap.la
-
pac_responder_tests_SOURCES = \
src/tests/pac_responder-tests.c \
src/responder/pac/pacsrv_utils.c
@@ -1222,14 +1215,8 @@ krb5_child_test_LDADD = \
libsss_test_common.la
if HAVE_CMOCKA
-TEST_MOCK_OBJ = \
- src/tests/common.c \
- src/tests/leak_check.c
TEST_MOCK_RESP_OBJ = \
- $(TEST_MOCK_OBJ) \
- src/tests/common_tev.c \
- src/tests/common_dom.c \
src/tests/cmocka/common_mock_resp.c \
src/responder/common/responder_packet.c \
src/responder/common/responder_cmd.c \
@@ -1255,6 +1242,7 @@ nss_srv_tests_LDFLAGS = \
-Wl,-wrap,sss_cmd_done
nss_srv_tests_LDADD = \
$(CMOCKA_LIBS) \
+ libsss_test_common.la \
libsss_idmap.la \
libsss_util.la
@@ -1285,13 +1273,18 @@ test_io_CFLAGS = \
test_io_LDADD = \
$(CMOCKA_LIBS)
+sss_nss_idmap_tests_SOURCES = \
+ src/tests/cmocka/sss_nss_idmap-tests.c
+sss_nss_idmap_tests_CFLAGS = \
+ $(AM_CFLAGS)
+sss_nss_idmap_tests_LDADD = \
+ $(CMOCKA_LIBS) \
+ libsss_nss_idmap.la
+
dyndns_tests_DEPENDENCIES = \
$(ldblib_LTLIBRARIES)
dyndns_tests_SOURCES = \
- $(TEST_MOCK_OBJ) \
$(SSSD_RESOLV_OBJ) \
- src/tests/common_tev.c \
- src/tests/common_dom.c \
src/tests/cmocka/test_dyndns.c \
src/providers/data_provider_opts.c
dyndns_tests_CFLAGS = \
@@ -1304,6 +1297,7 @@ dyndns_tests_LDFLAGS = \
dyndns_tests_LDADD = \
$(CARES_LIBS) \
$(CMOCKA_LIBS) \
+ libsss_test_common.la \
libsss_util.la
endif
diff --git a/src/tests/sss_nss_idmap-tests.c b/src/tests/cmocka/sss_nss_idmap-tests.c
index e4831a33..e4831a33 100644
--- a/src/tests/sss_nss_idmap-tests.c
+++ b/src/tests/cmocka/sss_nss_idmap-tests.c
diff --git a/src/tests/leak_check.c b/src/tests/leak_check.c
index 89dac357..06941195 100644
--- a/src/tests/leak_check.c
+++ b/src/tests/leak_check.c
@@ -23,7 +23,6 @@
*/
#include <stdio.h>
-#include <check.h>
#include "tests/common.h"
#include "util/util.h"
#include "util/dlinklist.h"