diff --git a/t/Makefile.am b/t/Makefile.am
index d35bb77db9a824e84c5787d423d38302335cbb88..4587d47c2da5385f1fdb0a210773a260227c6582 100644 (file)
--- a/t/Makefile.am
+++ b/t/Makefile.am
EXTRA_DIST = \
coverage.sh \
testwrapper.sh \
+ integration/client.sh \
integration/config.sh \
integration/ssl.sh \
- integration/query.sh \
+ integration/query_fetch.sh \
+ integration/query_list.sh \
+ integration/query_timeseries.sh \
integration/matching.sh \
integration/filter.sh \
integration/test_lib.sh \
# 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 =
# unit tests
#
-LOG_COMPILER = $(abs_srcdir)/testwrapper.sh
+LOG_COMPILER = env VPATH=$(VPATH) $(abs_srcdir)/testwrapper.sh
if UNIT_TESTING
UNIT_TESTS = \
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_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)
@@ -100,6 +102,14 @@ 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)