Fix: check validity of a stream before invoking ust flush command

[lttng-tools.git] / tests / unit / Makefile.am

diff --git a/tests/unit/Makefile.am b/tests/unit/Makefile.am
index f9dd53bef40125cc3b2a24469918cd2e4ebab39e..80943ce321e5810618bece14030ce7b49570333e 100644 (file)
--- a/tests/unit/Makefile.am
+++ b/tests/unit/Makefile.am
@@ -1,7 +1,6 @@
 SUBDIRS = ini_config
 
-AM_CFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src -I$(top_srcdir)/tests/utils/ -I$(srcdir)
-AM_LDFLAGS =
+AM_CPPFLAGS += -I$(top_srcdir)/tests/utils/ -I$(srcdir)
 
 LOG_DRIVER_FLAGS='--merge'
 LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) \
@@ -12,7 +11,8 @@ TESTS = test_kernel_data \
        test_uri \
        test_utils_parse_size_suffix \
        test_utils_expand_path \
-       ini_config/test_ini_config
+       ini_config/test_ini_config \
+       test_fd_tracker
 
 if LTTNG_TOOLS_BUILD_WITH_LIBDL
 LIBS += -ldl
@@ -24,13 +24,16 @@ endif
 LIBTAP=$(top_builddir)/tests/utils/tap/libtap.la
 
 LIBCOMMON=$(top_builddir)/src/common/libcommon.la
+LIBFDTRACKER=$(top_builddir)/src/common/fd-tracker/libfd-tracker.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
+noinst_PROGRAMS = test_uri test_session test_kernel_data \
+                  test_utils_parse_size_suffix \
+                  test_utils_expand_path \
+                  test_fd_tracker
 
 if HAVE_LIBLTTNG_UST_CTL
 noinst_PROGRAMS += test_ust_data
@@ -66,6 +69,7 @@ UST_DATA_TRACE=$(top_builddir)/src/bin/lttng-sessiond/trace-ust.$(OBJEXT) \
               $(top_builddir)/src/bin/lttng-sessiond/utils.$(OBJEXT) \
                   $(top_builddir)/src/bin/lttng-sessiond/buffer-registry.$(OBJEXT) \
                   $(top_builddir)/src/bin/lttng-sessiond/ust-registry.$(OBJEXT) \
+                  $(top_builddir)/src/bin/lttng-sessiond/ust-field-utils.$(OBJEXT) \
                   $(top_builddir)/src/bin/lttng-sessiond/ust-metadata.$(OBJEXT) \
                   $(top_builddir)/src/bin/lttng-sessiond/ust-app.$(OBJEXT) \
                   $(top_builddir)/src/bin/lttng-sessiond/ust-consumer.$(OBJEXT) \
@@ -73,6 +77,7 @@ UST_DATA_TRACE=$(top_builddir)/src/bin/lttng-sessiond/trace-ust.$(OBJEXT) \
                   $(top_builddir)/src/bin/lttng-sessiond/session.$(OBJEXT) \
                   $(top_builddir)/src/bin/lttng-sessiond/snapshot.$(OBJEXT) \
                   $(top_builddir)/src/bin/lttng-sessiond/agent.$(OBJEXT) \
+                  $(top_builddir)/src/bin/lttng-sessiond/tracker.$(OBJEXT) \
                   $(top_builddir)/src/common/libcommon.la \
                   $(top_builddir)/src/common/health/libhealth.la \
                   $(top_builddir)/src/common/sessiond-comm/libsessiond-comm.la
@@ -87,6 +92,7 @@ endif
 KERN_DATA_TRACE=$(top_builddir)/src/bin/lttng-sessiond/trace-kernel.$(OBJEXT) \
                $(top_builddir)/src/bin/lttng-sessiond/consumer.$(OBJEXT) \
                $(top_builddir)/src/bin/lttng-sessiond/utils.$(OBJEXT) \
+               $(top_builddir)/src/bin/lttng-sessiond/tracker.$(OBJEXT) \
                $(top_builddir)/src/common/libcommon.la \
                $(top_builddir)/src/common/health/libhealth.la \
                $(top_builddir)/src/common/sessiond-comm/libsessiond-comm.la
@@ -108,3 +114,7 @@ test_utils_parse_size_suffix_LDADD += $(UTILS_SUFFIX)
 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)
+
+# fd tracker unit test
+test_fd_tracker_SOURCES = test_fd_tracker.c
+test_fd_tracker_LDADD = $(LIBTAP) $(LIBFDTRACKER) $(DL_LIBS) -lurcu $(LIBCOMMON) $(LIBHASHTABLE)