X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2FMakefile.am;h=d55349b837e5745f5a93d82162d560d49e559644;hb=86197e2d95d71403070d788205bb93040b8862bf;hp=61328af23eded6b65a7e3a94f86b926d9e7d584f;hpb=1557c5994724e2a4c948d2e03d2782c2838d6e54;p=sysdb.git

diff --git a/t/Makefile.am b/t/Makefile.am
index 61328af..d55349b 100644
--- a/t/Makefile.am
+++ b/t/Makefile.am
@@ -1,8 +1,11 @@
 EXTRA_DIST = \
 		coverage.sh \
 		testwrapper.sh \
-		integration/simple_config.sh \
-		integration/simple_query.sh \
+		integration/config.sh \
+		integration/ssl.sh \
+		integration/query.sh \
+		integration/matching.sh \
+		integration/filter.sh \
 		integration/test_lib.sh \
 		valgrind.suppress
 
@@ -32,6 +35,7 @@ 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 \
@@ -42,6 +46,7 @@ unit_libsysdb_test_SOURCES = \
 		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@
@@ -60,7 +65,12 @@ 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/ssl.sh \
+		integration/query.sh \
+		integration/matching.sh \
+		integration/filter.sh
 endif
 
 check_LTLIBRARIES += integration/mock_plugin.la
@@ -69,5 +79,11 @@ integration_mock_plugin_la_SOURCES = integration/mock_plugin.c
 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