X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2FMakefile.am;h=562ee1da7f9c3ea6b296a380aa74b9fdf4af1c7c;hb=97aa30ed76096fbd663290d340de40a9ca7acdab;hp=c63a2bb21d0c8f9a8e1ee25836723266f70fbebe;hpb=dfb8c3997e59f23727872d981b19ea59023a4ad5;p=sysdb.git

diff --git a/t/Makefile.am b/t/Makefile.am
index c63a2bb..562ee1d 100644
--- a/t/Makefile.am
+++ b/t/Makefile.am
@@ -5,32 +5,55 @@ AM_CFLAGS = @STRICT_CFLAGS@ @COVERAGE_CFLAGS@
 AM_LDFLAGS = @COVERAGE_LDFLAGS@
 AM_CPPFLAGS = -I$(top_srcdir)/src/include
 
-TESTS = libsysdb_test libsysdb_net_test
-check_PROGRAMS = libsysdb_test libsysdb_net_test
-
-libsysdb_test_SOURCES = \
-		libsysdb_test.c libsysdb_test.h \
-		core/data_test.c \
-		core/object_test.c \
-		core/store_test.c \
-		core/store_lookup_test.c \
-		core/time_test.c \
-		frontend/parser_test.c \
-		frontend/sock_test.c \
-		utils/channel_test.c \
-		utils/dbi_test.c \
-		utils/llist_test.c \
-		utils/strbuf_test.c
-libsysdb_test_CFLAGS = $(AM_CFLAGS) @CHECK_CFLAGS@
-libsysdb_test_LDADD = $(top_builddir)/src/libsysdb.la @CHECK_LIBS@
-
-libsysdb_net_test_SOURCES = \
-		libsysdb_net_test.c libsysdb_test.h
+TESTS =
+check_PROGRAMS =
+noinst_LTLIBRARIES =
+
+#
+# unit tests
+#
+
+TESTS += unit/libsysdb_test unit/libsysdb_net_test
+check_PROGRAMS += unit/libsysdb_test unit/libsysdb_net_test
+
+unit_libsysdb_test_SOURCES = \
+		unit/libsysdb_test.c unit/libsysdb_test.h \
+		unit/libsysdb_testutils.c unit/libsysdb_testutils.h \
+		unit/core/data_test.c \
+		unit/core/object_test.c \
+		unit/core/store_test.c \
+		unit/core/store_lookup_test.c \
+		unit/core/time_test.c \
+		unit/frontend/connection_test.c \
+		unit/frontend/parser_test.c \
+		unit/frontend/sock_test.c \
+		unit/utils/channel_test.c \
+		unit/utils/dbi_test.c \
+		unit/utils/llist_test.c \
+		unit/utils/strbuf_test.c
+unit_libsysdb_test_CFLAGS = $(AM_CFLAGS) @CHECK_CFLAGS@ -I$(top_srcdir)/t/unit
+unit_libsysdb_test_LDADD = $(top_builddir)/src/libsysdb.la @CHECK_LIBS@
+
+unit_libsysdb_net_test_SOURCES = \
+		unit/libsysdb_net_test.c unit/libsysdb_test.h \
+		unit/libsysdb_testutils.c unit/libsysdb_testutils.h
 if BUILD_WITH_FOPENCOOKIE
-libsysdb_net_test_SOURCES += utils/unixsock_test.c
+unit_libsysdb_net_test_SOURCES += unit/utils/unixsock_test.c
 endif
-libsysdb_net_test_CFLAGS = $(AM_CFLAGS) @CHECK_CFLAGS@
-libsysdb_net_test_LDADD = $(top_builddir)/src/libsysdb.la @CHECK_LIBS@
+unit_libsysdb_net_test_CFLAGS = $(AM_CFLAGS) @CHECK_CFLAGS@ -I$(top_srcdir)/t/unit
+unit_libsysdb_net_test_LDADD = $(top_builddir)/src/libsysdb.la @CHECK_LIBS@
+
+#
+# integration tests
+#
+
+TESTS += integration/simple_config.sh integration/simple_query.sh
+
+noinst_LTLIBRARIES += integration/mock_plugin.la
+integration_mock_plugin_la_SOURCES = integration/mock_plugin.c
+# -rpath is a work-around to enforce a shared library
+integration_mock_plugin_la_LDFLAGS = $(AM_LDFLAGS) -module -avoid-version \
+		-rpath /nonexistent
 
 test: check