X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2FMakefile.am;h=cff09200d359f11a93a0211ac44c14b7a7180728;hb=789753071f0628ba111a12a87b701c74cfbf43f3;hp=43d24d986ba541a8092a4448c50c94974a439502;hpb=72a4156c91fd019b2e105c09708278fcdd321cce;p=sysdb.git

diff --git a/t/Makefile.am b/t/Makefile.am
index 43d24d9..cff0920 100644
--- a/t/Makefile.am
+++ b/t/Makefile.am
@@ -1,7 +1,10 @@
 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
 
@@ -12,12 +15,14 @@ AM_CPPFLAGS = -I$(top_srcdir)/src/include
 
 TESTS =
 check_PROGRAMS =
-noinst_LTLIBRARIES =
+check_LTLIBRARIES =
 
 #
 # 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
@@ -29,14 +34,18 @@ unit_libsysdb_test_SOURCES = \
 		unit/core/data_test.c \
 		unit/core/object_test.c \
 		unit/core/store_test.c \
+		unit/core/store_json_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/avltree_test.c \
 		unit/utils/channel_test.c \
 		unit/utils/dbi_test.c \
 		unit/utils/llist_test.c \
+		unit/utils/os_test.c \
+		unit/utils/proto_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@
@@ -55,14 +64,24 @@ unit_libsysdb_net_test_LDADD = $(top_builddir)/src/libsysdb.la @CHECK_LIBS@
 #
 
 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
 
-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 \
 		-rpath /nonexistent
 
+check_LTLIBRARIES += integration/mock_timeseries.la
+integration_mock_timeseries_la_SOURCES = integration/mock_timeseries.c
+# -rpath is a work-around to enforce a shared library
+integration_mock_timeseries_la_LDFLAGS = $(AM_LDFLAGS) -module -avoid-version \
+		-rpath /nonexistent
+
 test: check