diff --git a/t/Makefile.am b/t/Makefile.am
index 43d24d986ba541a8092a4448c50c94974a439502..454e4c4731ca0b0d6c2501cfca5d56eef2a52bb5 100644 (file)
--- a/t/Makefile.am
+++ b/t/Makefile.am
EXTRA_DIST = \
coverage.sh \
EXTRA_DIST = \
coverage.sh \
- integration/simple_config.sh \
- integration/simple_query.sh \
+ testwrapper.sh \
+ integration/config.sh \
+ integration/query.sh \
+ integration/matching.sh \
+ integration/filter.sh \
integration/test_lib.sh \
valgrind.suppress
integration/test_lib.sh \
valgrind.suppress
TESTS =
check_PROGRAMS =
TESTS =
check_PROGRAMS =
-noinst_LTLIBRARIES =
+check_LTLIBRARIES =
#
# unit tests
#
#
# unit tests
#
+LOG_COMPILER = $(abs_srcdir)/testwrapper.sh
+
if UNIT_TESTING
TESTS += unit/libsysdb_test unit/libsysdb_net_test
check_PROGRAMS += unit/libsysdb_test unit/libsysdb_net_test
if UNIT_TESTING
TESTS += unit/libsysdb_test unit/libsysdb_net_test
check_PROGRAMS += unit/libsysdb_test unit/libsysdb_net_test
unit/frontend/connection_test.c \
unit/frontend/parser_test.c \
unit/frontend/sock_test.c \
unit/frontend/connection_test.c \
unit/frontend/parser_test.c \
unit/frontend/sock_test.c \
+ unit/utils/avltree_test.c \
unit/utils/channel_test.c \
unit/utils/dbi_test.c \
unit/utils/llist_test.c \
unit/utils/channel_test.c \
unit/utils/dbi_test.c \
unit/utils/llist_test.c \
+ unit/utils/os_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/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@
#
if INTEGRATION_TESTING
#
if INTEGRATION_TESTING
-TESTS += integration/simple_config.sh integration/simple_query.sh
+TESTS += \
+ integration/config.sh \
+ integration/query.sh \
+ integration/matching.sh \
+ integration/filter.sh
endif
endif
-noinst_LTLIBRARIES += integration/mock_plugin.la
+check_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 \
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 \