-check_PROGRAMS = common_test utils_avltree_test utils_vl_lookup_test
-
-common_test_SOURCES = common_test.c \
- common.h common.c \
- mock/plugin.c \
- mock/utils_cache.c \
- mock/utils_time.c
-common_test_CPPFLAGS = $(AM_CPPFLAGS) $(LTDLINCL)
-common_test_LDFLAGS = -export-dynamic
-common_test_LDADD =
-
-utils_avltree_test_SOURCES = utils_avltree_test.c \
- utils_avltree.c utils_avltree.h
-utils_avltree_test_CPPFLAGS = $(AM_CPPFLAGS) $(LTDLINCL)
-utils_avltree_test_LDFLAGS = -export-dynamic
-utils_avltree_test_LDADD =
-
-utils_vl_lookup_test_SOURCES = utils_vl_lookup_test.c \
- utils_vl_lookup.h utils_vl_lookup.c \
- utils_avltree.c utils_avltree.h \
- common.c common.h \
- mock/plugin.c \
- mock/utils_cache.c \
- mock/utils_time.c
-utils_vl_lookup_test_CPPFLAGS = $(AM_CPPFLAGS) $(LTDLINCL)
-utils_vl_lookup_test_CFLAGS = $(AM_CFLAGS)
-utils_vl_lookup_test_LDFLAGS = -export-dynamic
-utils_vl_lookup_test_LDADD =
-
-TESTS = common_test utils_avltree_test utils_vl_lookup_test
+check_PROGRAMS = test_common test_utils_avltree test_utils_heap test_utils_mount test_utils_vl_lookup
+
+test_common_SOURCES = tests/test_common.c \
+ daemon/common.h daemon/common.c \
+ tests/mock/plugin.c \
+ tests/mock/utils_cache.c \
+ tests/mock/utils_time.c
+test_common_CPPFLAGS = $(AM_CPPFLAGS) $(LTDLINCL)
+test_common_LDFLAGS = -export-dynamic
+test_common_LDADD =
+
+test_utils_avltree_SOURCES = tests/test_utils_avltree.c \
+ daemon/utils_avltree.c daemon/utils_avltree.h
+test_utils_avltree_CPPFLAGS = $(AM_CPPFLAGS) $(LTDLINCL)
+test_utils_avltree_LDFLAGS = -export-dynamic
+test_utils_avltree_LDADD =
+
+test_utils_heap_SOURCES = tests/test_utils_heap.c \
+ daemon/utils_heap.c daemon/utils_heap.h
+test_utils_heap_CPPFLAGS = $(AM_CPPFLAGS) $(LTDLINCL)
+test_utils_heap_LDFLAGS = -export-dynamic
+test_utils_heap_LDADD =
+
+test_utils_mount_SOURCES = tests/test_utils_mount.c \
+ utils_mount.c utils_mount.h \
+ daemon/common.c daemon/common.h \
+ tests/mock/plugin.c \
+ tests/mock/utils_cache.c \
+ tests/mock/utils_time.c
+test_utils_mount_CPPFLAGS = $(AM_CPPFLAGS) $(LTDLINCL)
+test_utils_mount_LDFLAGS = -export-dynamic
+test_utils_mount_LDADD =
+
+test_utils_vl_lookup_SOURCES = tests/test_utils_vl_lookup.c \
+ utils_vl_lookup.h utils_vl_lookup.c \
+ daemon/utils_avltree.c daemon/utils_avltree.h \
+ daemon/common.c daemon/common.h \
+ tests/mock/plugin.c \
+ tests/mock/utils_cache.c \
+ tests/mock/utils_time.c
+test_utils_vl_lookup_CPPFLAGS = $(AM_CPPFLAGS) $(LTDLINCL)
+test_utils_vl_lookup_LDFLAGS = -export-dynamic
+test_utils_vl_lookup_LDADD =
+
+TESTS = test_common test_utils_avltree test_utils_heap test_utils_mount test_utils_vl_lookup