Fix: consumerd metadata channel/cache/timer races

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

diff --git a/tests/unit/Makefile.am b/tests/unit/Makefile.am
index 51d755784ed6847696557f24766abceaf4d91dc5..c9e1bfcf44d2cd99ca0ce4505993f501e7ad45a6 100644 (file)
--- a/tests/unit/Makefile.am
+++ b/tests/unit/Makefile.am
@@ -14,8 +14,6 @@ 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
 
-EXTRA_DIST = run.sh
-
 if HAVE_LIBLTTNG_UST_CTL
 noinst_PROGRAMS = test_uri test_session test_ust_data test_kernel_data
 else
@@ -24,34 +22,47 @@ endif
 
 # URI unit tests
 test_uri_SOURCES = test_uri.c
-test_uri_LDADD = $(LIBTAP) $(LIBCOMMON)
+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/common/uri.c                         \
-        $(top_srcdir)/src/common/utils.c                       \
+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
 
 test_session_SOURCES = test_session.c $(SESSIONS)
-test_session_LDADD = $(LIBTAP) $(LIBCOMMON) $(LIBSESSIOND_COMM) $(LIBHASHTABLE)
+test_session_LDADD = $(LIBTAP) $(LIBCOMMON) $(LIBSESSIOND_COMM) $(LIBHASHTABLE) \
+                                        -lrt
 
 # 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/common/uri.c                   \
-              $(top_srcdir)/src/common/utils.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)
+test_ust_data_LDADD = $(LIBTAP) $(LIBCOMMON) $(LIBSESSIOND_COMM) $(LIBHASHTABLE) \
+                                         -lrt -llttng-ust-ctl
 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/common/uri.c                          \
+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)
+test_kernel_data_LDADD = $(LIBTAP) $(LIBCOMMON) $(LIBSESSIOND_COMM) $(LIBHASHTABLE) \
+                                                -lrt