diff --git a/t/Makefile.am b/t/Makefile.am
index 4b233193ad6890d09f926027d9f573cc41b357d1..3f1fd4bc20179d0ac8dc2f2b4da763d788b664ee 100644 (file)
--- a/t/Makefile.am
+++ b/t/Makefile.am
# 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/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/frontend/parser_test \
unit/frontend/query_test \
unit/frontend/sock_test \
+ unit/parser/parser_test \
unit/utils/avltree_test \
unit/utils/channel_test \
unit/utils/dbi_test \
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)
@@ -95,6 +102,10 @@ 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_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)