X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2FMakefile.am;h=8fccbd222174ecd149c796e6d9abdbf83ec9dbca;hb=922392df96c60710a28cc17b8df6173bc96350e1;hp=bfeadcfc13d7cab9485c6ae20eaa310b99f46e1e;hpb=f583e8aebf51c49bd03d2dc4a8ecc9d5d5a3b3ef;p=sysdb.git

diff --git a/t/Makefile.am b/t/Makefile.am
index bfeadcf..8fccbd2 100644
--- a/t/Makefile.am
+++ b/t/Makefile.am
@@ -1,8 +1,13 @@
 EXTRA_DIST = \
 		coverage.sh \
-		integration/simple_config.sh \
-		integration/simple_query.sh \
-		integration/test_lib.sh
+		testwrapper.sh \
+		integration/config.sh \
+		integration/ssl.sh \
+		integration/query.sh \
+		integration/matching.sh \
+		integration/filter.sh \
+		integration/test_lib.sh \
+		valgrind.suppress
 
 # coverage related flags are only set when gcov is enabled
 AM_CFLAGS = @STRICT_CFLAGS@ @COVERAGE_CFLAGS@
@@ -11,12 +16,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
@@ -28,14 +35,19 @@ 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/frontend/query_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@
@@ -54,14 +66,25 @@ 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
 
-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