X-Git-Url: https://git.tokkee.org/?p=sysdb.git;a=blobdiff_plain;f=t%2FMakefile.am;h=1b2960d982defe93128dcb43cad4d3d59f2d3be8;hp=cff09200d359f11a93a0211ac44c14b7a7180728;hb=8c60138c3491a844ed2302709763331d1c8375fd;hpb=d01cf06de423b934d028f8ae0a5d76376e333c4e

diff --git a/t/Makefile.am b/t/Makefile.am
index cff0920..1b2960d 100644
--- a/t/Makefile.am
+++ b/t/Makefile.am
@@ -2,6 +2,7 @@ EXTRA_DIST = \
 		coverage.sh \
 		testwrapper.sh \
 		integration/config.sh \
+		integration/ssl.sh \
 		integration/query.sh \
 		integration/matching.sh \
 		integration/filter.sh \
@@ -11,7 +12,8 @@ EXTRA_DIST = \
 # 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
+AM_CPPFLAGS = -I$(top_builddir)/src/include \
+		-I$(top_srcdir)/src/include -I$(top_srcdir)/src
 
 TESTS =
 check_PROGRAMS =
@@ -21,55 +23,143 @@ check_LTLIBRARIES =
 # unit tests
 #
 
-LOG_COMPILER = $(abs_srcdir)/testwrapper.sh
+LOG_COMPILER = env VPATH=$(VPATH) $(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_TESTS = \
+		unit/core/data_test \
+		unit/core/object_test \
+		unit/core/store_expr_test \
+		unit/core/store_json_test \
+		unit/core/store_lookup_test \
+		unit/core/store_test \
+		unit/core/time_test \
+		unit/frontend/connection_test \
+		unit/frontend/parser_test \
+		unit/frontend/query_test \
+		unit/frontend/sock_test \
+		unit/parser/ast_test \
+		unit/parser/ast_test \
+		unit/parser/parser_test \
+		unit/utils/avltree_test \
+		unit/utils/channel_test \
+		unit/utils/dbi_test \
+		unit/utils/llist_test \
+		unit/utils/os_test \
+		unit/utils/proto_test \
+		unit/utils/strbuf_test
+
+UNIT_TEST_SOURCES = unit/testutils.c unit/testutils.h
+UNIT_TEST_CFLAGS = $(AM_CFLAGS) @CHECK_CFLAGS@ -I$(top_srcdir)/t/unit
+UNIT_TEST_LDADD = $(top_builddir)/src/libsysdb.la @CHECK_LIBS@
 
-unit_libsysdb_test_SOURCES = \
-		unit/libsysdb_test.c unit/libsysdb_test.h \
-		unit/libsysdb_testutils.c unit/libsysdb_testutils.h \
-		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@
-
-unit_libsysdb_net_test_SOURCES = \
-		unit/libsysdb_net_test.c unit/libsysdb_test.h \
-		unit/libsysdb_testutils.c unit/libsysdb_testutils.h
 if BUILD_WITH_FOPENCOOKIE
-unit_libsysdb_net_test_SOURCES += unit/utils/unixsock_test.c
+UNIT_TESTS += unit/utils/unixsock_test
+unit_utils_unixsock_test_SOURCES = $(UNIT_TEST_SOURCES) unit/utils/unixsock_test.c
+unit_utils_unixsock_test_CFLAGS = $(UNIT_TEST_CFLAGS)
+unit_utils_unixsock_test_LDADD = $(UNIT_TEST_LDADD)
+endif
+
+unit_core_data_test_SOURCES = $(UNIT_TEST_SOURCES) unit/core/data_test.c
+unit_core_data_test_CFLAGS = $(UNIT_TEST_CFLAGS)
+unit_core_data_test_LDADD = $(UNIT_TEST_LDADD)
+
+unit_core_object_test_SOURCES = $(UNIT_TEST_SOURCES) unit/core/object_test.c
+unit_core_object_test_CFLAGS = $(UNIT_TEST_CFLAGS)
+unit_core_object_test_LDADD = $(UNIT_TEST_LDADD)
+
+unit_core_store_expr_test_SOURCES = $(UNIT_TEST_SOURCES) unit/core/store_expr_test.c
+unit_core_store_expr_test_CFLAGS = $(UNIT_TEST_CFLAGS)
+unit_core_store_expr_test_LDADD = $(UNIT_TEST_LDADD)
+
+unit_core_store_json_test_SOURCES = $(UNIT_TEST_SOURCES) unit/core/store_json_test.c
+unit_core_store_json_test_CFLAGS = $(UNIT_TEST_CFLAGS)
+unit_core_store_json_test_LDADD = $(UNIT_TEST_LDADD)
+
+unit_core_store_lookup_test_SOURCES = $(UNIT_TEST_SOURCES) unit/core/store_lookup_test.c
+unit_core_store_lookup_test_CFLAGS = $(UNIT_TEST_CFLAGS)
+unit_core_store_lookup_test_LDADD = $(UNIT_TEST_LDADD)
+
+unit_core_store_test_SOURCES = $(UNIT_TEST_SOURCES) unit/core/store_test.c
+unit_core_store_test_CFLAGS = $(UNIT_TEST_CFLAGS)
+unit_core_store_test_LDADD = $(UNIT_TEST_LDADD)
+
+unit_core_time_test_SOURCES = $(UNIT_TEST_SOURCES) unit/core/time_test.c
+unit_core_time_test_CFLAGS = $(UNIT_TEST_CFLAGS)
+unit_core_time_test_LDADD = $(UNIT_TEST_LDADD)
+
+unit_frontend_connection_test_SOURCES = $(UNIT_TEST_SOURCES) unit/frontend/connection_test.c
+unit_frontend_connection_test_CFLAGS = $(UNIT_TEST_CFLAGS)
+unit_frontend_connection_test_LDADD = $(UNIT_TEST_LDADD)
+
+unit_frontend_parser_test_SOURCES = $(UNIT_TEST_SOURCES) unit/frontend/parser_test.c
+unit_frontend_parser_test_CFLAGS = $(UNIT_TEST_CFLAGS)
+unit_frontend_parser_test_LDADD = $(UNIT_TEST_LDADD)
+
+unit_frontend_query_test_SOURCES = $(UNIT_TEST_SOURCES) unit/frontend/query_test.c
+unit_frontend_query_test_CFLAGS = $(UNIT_TEST_CFLAGS)
+unit_frontend_query_test_LDADD = $(UNIT_TEST_LDADD)
+
+unit_frontend_sock_test_SOURCES = $(UNIT_TEST_SOURCES) unit/frontend/sock_test.c
+unit_frontend_sock_test_CFLAGS = $(UNIT_TEST_CFLAGS)
+unit_frontend_sock_test_LDADD = $(UNIT_TEST_LDADD)
+
+unit_parser_ast_test_SOURCES = $(UNIT_TEST_SOURCES) unit/parser/ast_test.c
+unit_parser_ast_test_CFLAGS = $(UNIT_TEST_CFLAGS)
+unit_parser_ast_test_LDADD = $(UNIT_TEST_LDADD)
+
+unit_parser_parser_test_SOURCES = $(UNIT_TEST_SOURCES) unit/parser/parser_test.c
+unit_parser_parser_test_CFLAGS = $(UNIT_TEST_CFLAGS)
+unit_parser_parser_test_LDADD = $(UNIT_TEST_LDADD)
+
+unit_utils_avltree_test_SOURCES = $(UNIT_TEST_SOURCES) unit/utils/avltree_test.c
+unit_utils_avltree_test_CFLAGS = $(UNIT_TEST_CFLAGS)
+unit_utils_avltree_test_LDADD = $(UNIT_TEST_LDADD)
+
+unit_utils_channel_test_SOURCES = $(UNIT_TEST_SOURCES) unit/utils/channel_test.c
+unit_utils_channel_test_CFLAGS = $(UNIT_TEST_CFLAGS)
+unit_utils_channel_test_LDADD = $(UNIT_TEST_LDADD)
+
+unit_utils_dbi_test_SOURCES = $(UNIT_TEST_SOURCES) unit/utils/dbi_test.c
+unit_utils_dbi_test_CFLAGS = $(UNIT_TEST_CFLAGS)
+unit_utils_dbi_test_LDADD = $(UNIT_TEST_LDADD)
+
+unit_utils_llist_test_SOURCES = $(UNIT_TEST_SOURCES) unit/utils/llist_test.c
+unit_utils_llist_test_CFLAGS = $(UNIT_TEST_CFLAGS)
+unit_utils_llist_test_LDADD = $(UNIT_TEST_LDADD)
+
+unit_utils_os_test_SOURCES = $(UNIT_TEST_SOURCES) unit/utils/os_test.c
+unit_utils_os_test_CFLAGS = $(UNIT_TEST_CFLAGS)
+unit_utils_os_test_LDADD = $(UNIT_TEST_LDADD)
+
+unit_utils_proto_test_SOURCES = $(UNIT_TEST_SOURCES) unit/utils/proto_test.c
+unit_utils_proto_test_CFLAGS = $(UNIT_TEST_CFLAGS)
+unit_utils_proto_test_LDADD = $(UNIT_TEST_LDADD)
+
+unit_utils_strbuf_test_SOURCES = $(UNIT_TEST_SOURCES) unit/utils/strbuf_test.c
+unit_utils_strbuf_test_CFLAGS = $(UNIT_TEST_CFLAGS)
+unit_utils_strbuf_test_LDADD = $(UNIT_TEST_LDADD)
+
+TESTS += $(UNIT_TESTS)
+check_PROGRAMS += $(UNIT_TESTS)
 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_TESTS = \
+		integration/client.sh \
 		integration/config.sh \
-		integration/query.sh \
+		integration/ssl.sh \
+		integration/query_fetch.sh \
+		integration/query_list.sh \
+		integration/query_timeseries.sh \
 		integration/matching.sh \
 		integration/filter.sh
-endif
+
+TESTS += $(INTEGRATION_TESTS)
 
 check_LTLIBRARIES += integration/mock_plugin.la
 integration_mock_plugin_la_SOURCES = integration/mock_plugin.c
@@ -82,6 +172,7 @@ 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
+endif
 
 test: check