X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2FMakefile.am;h=d55349b837e5745f5a93d82162d560d49e559644;hb=0c16d15b68164c504ceea3daca693e8c1f1026fa;hp=4764a6ed276d5fdd9a71469975816f75388dd5e3;hpb=cf17313d62dcf1c10df0fe19287e354ede68206b;p=sysdb.git

diff --git a/t/Makefile.am b/t/Makefile.am
index 4764a6e..d55349b 100644
--- a/t/Makefile.am
+++ b/t/Makefile.am
@@ -1,12 +1,33 @@
-EXTRA_DIST = coverage.sh
+EXTRA_DIST = \
+		coverage.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@
 AM_LDFLAGS = @COVERAGE_LDFLAGS@
 AM_CPPFLAGS = -I$(top_srcdir)/src/include
 
-TESTS = unit/libsysdb_test unit/libsysdb_net_test
-check_PROGRAMS = unit/libsysdb_test unit/libsysdb_net_test
+TESTS =
+check_PROGRAMS =
+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
+endif
 
 unit_libsysdb_test_SOURCES = \
 		unit/libsysdb_test.c unit/libsysdb_test.h \
@@ -14,14 +35,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@
@@ -35,5 +60,30 @@ endif
 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@
 
+#
+# integration tests
+#
+
+if INTEGRATION_TESTING
+TESTS += \
+		integration/config.sh \
+		integration/ssl.sh \
+		integration/query.sh \
+		integration/matching.sh \
+		integration/filter.sh
+endif
+
+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