X-Git-Url: https://git.tokkee.org/?p=sysdb.git;a=blobdiff_plain;f=t%2FMakefile.am;h=4587d47c2da5385f1fdb0a210773a260227c6582;hp=d35bb77db9a824e84c5787d423d38302335cbb88;hb=5d4e2d95292b3a5d5cb4079db8edbd53b6fddce0;hpb=2e1a0973075c1db057a5d7481ab5c8482f6ac3e8

diff --git a/t/Makefile.am b/t/Makefile.am
index d35bb77..4587d47 100644
--- a/t/Makefile.am
+++ b/t/Makefile.am
@@ -1,9 +1,12 @@
 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 \
@@ -12,7 +15,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 =
@@ -22,7 +26,7 @@ check_LTLIBRARIES =
 # unit tests
 #
 
-LOG_COMPILER = $(abs_srcdir)/testwrapper.sh
+LOG_COMPILER = env VPATH=$(VPATH) $(abs_srcdir)/testwrapper.sh
 
 if UNIT_TESTING
 UNIT_TESTS = \
@@ -34,9 +38,11 @@ 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 \
@@ -88,10 +94,6 @@ unit_frontend_connection_test_SOURCES = $(UNIT_TEST_SOURCES) unit/frontend/conne
 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)