X-Git-Url: https://git.tokkee.org/?p=sysdb.git;a=blobdiff_plain;f=t%2FMakefile.am;h=504e88c957be3f5e37aa0e745614b1a20054d460;hp=cc2607f75e2b09d9129cc9ff77cfe08630649932;hb=bb40de500bfe57d044ed45ed66e5d5c38f0818ba;hpb=72a63cfb0e65bb575889b8dbee6648cafd6a52f2

diff --git a/t/Makefile.am b/t/Makefile.am
index cc2607f..504e88c 100644
--- a/t/Makefile.am
+++ b/t/Makefile.am
@@ -5,34 +5,48 @@ 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 \
-		libsysdb_testutils.c libsysdb_testutils.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 \
-		libsysdb_testutils.c libsysdb_testutils.h
+TESTS =
+check_PROGRAMS =
+
+#
+# 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
 
 test: check