+SUBDIRS = ini_config
+
AM_CFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src -I$(top_srcdir)/tests/utils/ -I$(srcdir)
AM_LDFLAGS =
+LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) \
+ $(top_srcdir)/config/tap-driver.sh
+
+TESTS = test_kernel_data \
+ test_session \
+ test_uri \
+ test_utils_parse_size_suffix \
+ test_utils_expand_path \
+ ini_config/test_ini_config
+
if LTTNG_TOOLS_BUILD_WITH_LIBDL
-AM_LDFLAGS += -ldl
+LIBS += -ldl
endif
if LTTNG_TOOLS_BUILD_WITH_LIBC_DL
-AM_LDFLAGS += -lc
+LIBS += -lc
endif
LIBTAP=$(top_builddir)/tests/utils/tap/libtap.la
LIBCOMMON=$(top_builddir)/src/common/libcommon.la
LIBSESSIOND_COMM=$(top_builddir)/src/common/sessiond-comm/libsessiond-comm.la
LIBHASHTABLE=$(top_builddir)/src/common/hashtable/libhashtable.la
+LIBRELAYD=$(top_builddir)/src/common/relayd/librelayd.la
+
+# Define test programs
+noinst_PROGRAMS = test_uri test_session test_kernel_data
+noinst_PROGRAMS += test_utils_parse_size_suffix test_utils_expand_path
if HAVE_LIBLTTNG_UST_CTL
-noinst_PROGRAMS = test_uri test_session test_ust_data test_kernel_data
-else
-noinst_PROGRAMS = test_uri test_session test_kernel_data
+noinst_PROGRAMS += test_ust_data
+TESTS += test_ust_data
endif
# URI unit tests
test_uri_LDADD = $(LIBTAP) $(LIBCOMMON) $(LIBHASHTABLE)
# Session unit test
-SESSIONS=$(top_srcdir)/src/bin/lttng-sessiond/session.c \
- $(top_srcdir)/src/bin/lttng-sessiond/consumer.c \
- $(top_srcdir)/src/bin/lttng-sessiond/health.c \
- $(top_srcdir)/src/common/uri.c \
- $(top_srcdir)/src/common/utils.c \
- $(top_srcdir)/src/common/error.c
+SESSIONS=$(top_builddir)/src/bin/lttng-sessiond/session.o \
+ $(top_builddir)/src/bin/lttng-sessiond/consumer.o \
+ $(top_builddir)/src/bin/lttng-sessiond/utils.o \
+ $(top_builddir)/src/bin/lttng-sessiond/snapshot.o \
+ $(top_builddir)/src/common/uri.o \
+ $(top_builddir)/src/common/utils.o \
+ $(top_builddir)/src/common/error.o \
+ $(top_builddir)/src/common/health/libhealth.la \
+ $(top_builddir)/src/common/sessiond-comm/libsessiond-comm.la
+
-test_session_SOURCES = test_session.c $(SESSIONS)
-test_session_LDADD = $(LIBTAP) $(LIBCOMMON) $(LIBSESSIOND_COMM) $(LIBHASHTABLE) \
- -lrt
+test_session_SOURCES = test_session.c
+test_session_LDADD = $(LIBTAP) $(LIBCOMMON) $(LIBRELAYD) $(LIBSESSIOND_COMM) \
+ $(LIBHASHTABLE) -lrt
+test_session_LDADD += $(SESSIONS)
# UST data structures unit test
if HAVE_LIBLTTNG_UST_CTL
-UST_DATA_TRACE=$(top_srcdir)/src/bin/lttng-sessiond/trace-ust.c \
- $(top_srcdir)/src/bin/lttng-sessiond/consumer.c \
- $(top_srcdir)/src/bin/lttng-sessiond/buffer-registry.c \
- $(top_srcdir)/src/bin/lttng-sessiond/ust-registry.c \
- $(top_srcdir)/src/bin/lttng-sessiond/ust-metadata.c \
- $(top_srcdir)/src/bin/lttng-sessiond/ust-app.c \
- $(top_srcdir)/src/bin/lttng-sessiond/ust-consumer.c \
- $(top_srcdir)/src/bin/lttng-sessiond/fd-limit.c \
- $(top_srcdir)/src/bin/lttng-sessiond/health.c \
- $(top_srcdir)/src/bin/lttng-sessiond/session.c \
- $(top_srcdir)/src/common/uri.c \
- $(top_srcdir)/src/common/utils.c
-
-test_ust_data_SOURCES = test_ust_data.c $(UST_DATA_TRACE)
-test_ust_data_LDADD = $(LIBTAP) $(LIBCOMMON) $(LIBSESSIOND_COMM) $(LIBHASHTABLE) \
- -lrt -llttng-ust-ctl
+UST_DATA_TRACE=$(top_builddir)/src/bin/lttng-sessiond/trace-ust.o \
+ $(top_builddir)/src/bin/lttng-sessiond/consumer.o \
+ $(top_builddir)/src/bin/lttng-sessiond/utils.o \
+ $(top_builddir)/src/bin/lttng-sessiond/buffer-registry.o \
+ $(top_builddir)/src/bin/lttng-sessiond/ust-registry.o \
+ $(top_builddir)/src/bin/lttng-sessiond/ust-metadata.o \
+ $(top_builddir)/src/bin/lttng-sessiond/ust-app.o \
+ $(top_builddir)/src/bin/lttng-sessiond/ust-consumer.o \
+ $(top_builddir)/src/bin/lttng-sessiond/fd-limit.o \
+ $(top_builddir)/src/bin/lttng-sessiond/session.o \
+ $(top_builddir)/src/bin/lttng-sessiond/snapshot.o \
+ $(top_builddir)/src/bin/lttng-sessiond/agent.o \
+ $(top_builddir)/src/common/uri.o \
+ $(top_builddir)/src/common/utils.o \
+ $(top_builddir)/src/common/health/libhealth.la \
+ $(top_builddir)/src/common/sessiond-comm/libsessiond-comm.la
+
+test_ust_data_SOURCES = test_ust_data.c
+test_ust_data_LDADD = $(LIBTAP) $(LIBCOMMON) $(LIBRELAYD) $(LIBSESSIOND_COMM)\
+ $(LIBHASHTABLE) -lrt -llttng-ust-ctl
+test_ust_data_LDADD += $(UST_DATA_TRACE)
endif
# Kernel data structures unit test
-KERN_DATA_TRACE=$(top_srcdir)/src/bin/lttng-sessiond/trace-kernel.c \
- $(top_srcdir)/src/bin/lttng-sessiond/consumer.c \
- $(top_srcdir)/src/bin/lttng-sessiond/health.c \
- $(top_srcdir)/src/common/uri.c \
- $(top_srcdir)/src/common/utils.c
-
-test_kernel_data_SOURCES = test_kernel_data.c $(KERN_DATA_TRACE)
-test_kernel_data_LDADD = $(LIBTAP) $(LIBCOMMON) $(LIBSESSIOND_COMM) $(LIBHASHTABLE) \
- -lrt
+KERN_DATA_TRACE=$(top_builddir)/src/bin/lttng-sessiond/trace-kernel.o \
+ $(top_builddir)/src/bin/lttng-sessiond/consumer.o \
+ $(top_builddir)/src/bin/lttng-sessiond/utils.o \
+ $(top_builddir)/src/common/uri.o \
+ $(top_builddir)/src/common/utils.o \
+ $(top_builddir)/src/common/health/libhealth.la \
+ $(top_builddir)/src/common/sessiond-comm/libsessiond-comm.la
+
+test_kernel_data_SOURCES = test_kernel_data.c
+test_kernel_data_LDADD = $(LIBTAP) $(LIBCOMMON) $(LIBRELAYD) $(LIBSESSIOND_COMM) \
+ $(LIBHASHTABLE) -lrt
+test_kernel_data_LDADD += $(KERN_DATA_TRACE)
+
+# utils suffix for unit test
+UTILS_SUFFIX=$(top_builddir)/src/common/utils.o \
+ $(top_builddir)/src/common/runas.o
+
+# parse_size_suffix unit test
+test_utils_parse_size_suffix_SOURCES = test_utils_parse_size_suffix.c
+test_utils_parse_size_suffix_LDADD = $(LIBTAP) $(LIBHASHTABLE) $(LIBCOMMON)
+test_utils_parse_size_suffix_LDADD += $(UTILS_SUFFIX)
+
+# expand_path unit test
+test_utils_expand_path_SOURCES = test_utils_expand_path.c
+test_utils_expand_path_LDADD = $(LIBTAP) $(LIBHASHTABLE) $(LIBCOMMON)
+test_utils_expand_path_LDADD += $(UTILS_SUFFIX)