diff --git a/t/Makefile.am b/t/Makefile.am
index 7aa6d77af1bda155c2fc8a28b9ce3fb5b2cd4bce..4764a6ed276d5fdd9a71469975816f75388dd5e3 100644 (file)
--- a/t/Makefile.am
+++ b/t/Makefile.am
AM_LDFLAGS = @COVERAGE_LDFLAGS@
AM_CPPFLAGS = -I$(top_srcdir)/src/include
-TESTS = libsysdb_test libsysdb_net_test
-check_PROGRAMS = libsysdb_test libsysdb_net_test
+TESTS = unit/libsysdb_test unit/libsysdb_net_test
+check_PROGRAMS = unit/libsysdb_test unit/libsysdb_net_test
-libsysdb_test_SOURCES = \
- libsysdb_test.c libsysdb_test.h \
- core/object_test.c \
- core/store_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@
+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@
-libsysdb_net_test_SOURCES = \
- libsysdb_net_test.c libsysdb_test.h
+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@
test: check