t/integration/: Added simple SSL tests.

[sysdb.git] / t / Makefile.am

diff --git a/t/Makefile.am b/t/Makefile.am
index 5de153f16e5718cd9c316c5077dabb8ea5b54868..d55349b837e5745f5a93d82162d560d49e559644 100644 (file)
--- a/t/Makefile.am
+++ b/t/Makefile.am
@@ -1,7 +1,11 @@
 EXTRA_DIST = \
                coverage.sh \
-               integration/simple_config.sh \
-               integration/simple_query.sh \
+               testwrapper.sh \
+               integration/config.sh \
+               integration/ssl.sh \
+               integration/query.sh \
+               integration/matching.sh \
+               integration/filter.sh \
                integration/test_lib.sh \
                valgrind.suppress
 
@@ -18,6 +22,8 @@ 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,15 +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@
@@ -56,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
@@ -65,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