X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Funit%2FMakefile.am;h=0f8a8bb1db3f545af0025913dc7a481581fed3fc;hp=ee4a37b7f8510d66245072cb5fd717eb0adae5d6;hb=a7333da73c2083281c5ec833d041b7acf0d10d0b;hpb=c6db3843828a8fbf08444a2bc4191291a4807936

diff --git a/tests/unit/Makefile.am b/tests/unit/Makefile.am
index ee4a37b7f..0f8a8bb1d 100644
--- a/tests/unit/Makefile.am
+++ b/tests/unit/Makefile.am
@@ -39,48 +39,88 @@ endif
 test_uri_SOURCES = test_uri.c
 test_uri_LDADD = $(LIBTAP) $(LIBCOMMON) $(LIBHASHTABLE) $(DL_LIBS)
 
-# Session unit test
-SESSIONS=$(top_builddir)/src/bin/lttng-sessiond/session.$(OBJEXT) \
+# Sessiond objects
+SESSIOND_OBJS = $(top_builddir)/src/bin/lttng-sessiond/buffer-registry.$(OBJEXT) \
+	 $(top_builddir)/src/bin/lttng-sessiond/load-session-thread.$(OBJEXT) \
+	 $(top_builddir)/src/bin/lttng-sessiond/cmd.$(OBJEXT) \
+	 $(top_builddir)/src/bin/lttng-sessiond/save.$(OBJEXT) \
+	 $(top_builddir)/src/bin/lttng-sessiond/notification-thread-commands.$(OBJEXT) \
+	 $(top_builddir)/src/bin/lttng-sessiond/shm.$(OBJEXT) \
+	 $(top_builddir)/src/bin/lttng-sessiond/kernel.$(OBJEXT) \
+	 $(top_builddir)/src/bin/lttng-sessiond/ht-cleanup.$(OBJEXT) \
+	 $(top_builddir)/src/bin/lttng-sessiond/notification-thread.$(OBJEXT) \
+	 $(top_builddir)/src/bin/lttng-sessiond/lttng-syscall.$(OBJEXT) \
+	 $(top_builddir)/src/bin/lttng-sessiond/channel.$(OBJEXT) \
+	 $(top_builddir)/src/bin/lttng-sessiond/agent.$(OBJEXT) \
+	 $(top_builddir)/src/bin/lttng-sessiond/ready.$(OBJEXT) \
+	 $(top_builddir)/src/bin/lttng-sessiond/kernel-consumer.$(OBJEXT) \
+	 $(top_builddir)/src/bin/lttng-sessiond/trace-kernel.$(OBJEXT) \
+	 $(top_builddir)/src/bin/lttng-sessiond/rotation-thread.$(OBJEXT) \
+	 $(top_builddir)/src/bin/lttng-sessiond/context.$(OBJEXT) \
 	 $(top_builddir)/src/bin/lttng-sessiond/consumer.$(OBJEXT) \
 	 $(top_builddir)/src/bin/lttng-sessiond/utils.$(OBJEXT) \
+	 $(top_builddir)/src/bin/lttng-sessiond/fd-limit.$(OBJEXT) \
+	 $(top_builddir)/src/bin/lttng-sessiond/notification-thread-events.$(OBJEXT) \
+	 $(top_builddir)/src/bin/lttng-sessiond/event.$(OBJEXT) \
+	 $(top_builddir)/src/bin/lttng-sessiond/timer.$(OBJEXT) \
 	 $(top_builddir)/src/bin/lttng-sessiond/snapshot.$(OBJEXT) \
-	 $(top_builddir)/src/bin/lttng-sessiond/ht-cleanup.$(OBJEXT) \
+	 $(top_builddir)/src/bin/lttng-sessiond/sessiond-config.$(OBJEXT) \
+	 $(top_builddir)/src/bin/lttng-sessiond/rotate.$(OBJEXT) \
+	 $(top_builddir)/src/bin/lttng-sessiond/modprobe.$(OBJEXT) \
+	 $(top_builddir)/src/bin/lttng-sessiond/session.$(OBJEXT) \
+	 $(top_builddir)/src/bin/lttng-sessiond/globals.$(OBJEXT) \
+	 $(top_builddir)/src/bin/lttng-sessiond/thread-utils.$(OBJEXT) \
+	 $(top_builddir)/src/bin/lttng-sessiond/process-utils.$(OBJEXT) \
 	 $(top_builddir)/src/common/libcommon.la \
 	 $(top_builddir)/src/common/testpoint/libtestpoint.la \
 	 $(top_builddir)/src/common/compat/libcompat.la \
 	 $(top_builddir)/src/common/health/libhealth.la \
 	 $(top_builddir)/src/common/sessiond-comm/libsessiond-comm.la
 
+if HAVE_LIBLTTNG_UST_CTL
+SESSIOND_OBJS += $(top_builddir)/src/bin/lttng-sessiond/trace-ust.$(OBJEXT) \
+		 $(top_builddir)/src/bin/lttng-sessiond/ust-registry.$(OBJEXT) \
+		 $(top_builddir)/src/bin/lttng-sessiond/ust-app.$(OBJEXT) \
+		 $(top_builddir)/src/bin/lttng-sessiond/ust-consumer.$(OBJEXT) \
+		 $(top_builddir)/src/bin/lttng-sessiond/ust-thread.$(OBJEXT) \
+		 $(top_builddir)/src/bin/lttng-sessiond/ust-metadata.$(OBJEXT) \
+		 $(top_builddir)/src/bin/lttng-sessiond/agent-thread.$(OBJEXT) \
+		 $(top_builddir)/src/bin/lttng-sessiond/ust-field-utils.$(OBJEXT)
+endif
 
 test_session_SOURCES = test_session.c
 test_session_LDADD = $(LIBTAP) $(LIBCOMMON) $(LIBRELAYD) $(LIBSESSIOND_COMM) \
-		     $(LIBHASHTABLE) $(DL_LIBS) -lrt
-test_session_LDADD += $(SESSIONS)
+		     $(LIBHASHTABLE) $(DL_LIBS) -lrt -lurcu-common -lurcu \
+		     $(KMOD_LIBS) \
+		     $(top_builddir)/src/lib/lttng-ctl/liblttng-ctl.la \
+		     $(top_builddir)/src/common/kernel-ctl/libkernel-ctl.la \
+		     $(top_builddir)/src/common/compat/libcompat.la \
+		     $(top_builddir)/src/common/testpoint/libtestpoint.la \
+		     $(top_builddir)/src/common/health/libhealth.la \
+		     $(top_builddir)/src/common/config/libconfig.la \
+		     $(top_builddir)/src/common/string-utils/libstring-utils.la
+
+test_session_LDADD += $(SESSIOND_OBJS)
 
-# UST data structures unit test
 if HAVE_LIBLTTNG_UST_CTL
-UST_DATA_TRACE=$(top_builddir)/src/bin/lttng-sessiond/trace-ust.$(OBJEXT) \
-	       $(top_builddir)/src/bin/lttng-sessiond/consumer.$(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) \
-		   $(top_builddir)/src/bin/lttng-sessiond/fd-limit.$(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/notification-thread-commands.$(OBJEXT) \
-		   $(top_builddir)/src/common/libcommon.la \
-		   $(top_builddir)/src/common/health/libhealth.la \
-		   $(top_builddir)/src/common/sessiond-comm/libsessiond-comm.la
+test_session_LDADD += -llttng-ust-ctl
+endif
 
+# UST data structures unit test
+if HAVE_LIBLTTNG_UST_CTL
 test_ust_data_SOURCES = test_ust_data.c
-test_ust_data_LDADD = $(LIBTAP) $(LIBCOMMON) $(LIBRELAYD) $(LIBSESSIOND_COMM)\
-		      $(LIBHASHTABLE) $(DL_LIBS) -lrt -llttng-ust-ctl
-test_ust_data_LDADD += $(UST_DATA_TRACE)
+test_ust_data_LDADD = $(LIBTAP) $(LIBCOMMON) $(LIBRELAYD) $(LIBSESSIOND_COMM) \
+		      $(LIBHASHTABLE) $(DL_LIBS) -lrt -lurcu-common -lurcu \
+		      -llttng-ust-ctl \
+		      $(KMOD_LIBS) \
+		      $(top_builddir)/src/lib/lttng-ctl/liblttng-ctl.la \
+		      $(top_builddir)/src/common/kernel-ctl/libkernel-ctl.la \
+		      $(top_builddir)/src/common/compat/libcompat.la \
+		      $(top_builddir)/src/common/testpoint/libtestpoint.la \
+		      $(top_builddir)/src/common/health/libhealth.la \
+		      $(top_builddir)/src/common/config/libconfig.la \
+		      $(top_builddir)/src/common/string-utils/libstring-utils.la
+test_ust_data_LDADD += $(SESSIOND_OBJS)
 endif
 
 # Kernel data structures unit test