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

diff --git a/tests/unit/Makefile.am b/tests/unit/Makefile.am
index ee4a37b7f..a949d3cdd 100644
--- a/tests/unit/Makefile.am
+++ b/tests/unit/Makefile.am
@@ -12,6 +12,7 @@ TESTS = test_kernel_data \
 	test_utils_parse_size_suffix \
 	test_utils_parse_time_suffix \
 	test_utils_expand_path \
+	test_utils_compat_poll \
 	test_string_utils \
 	test_notification \
 	ini_config/test_ini_config
@@ -28,7 +29,8 @@ LIBLTTNG_CTL=$(top_builddir)/src/lib/lttng-ctl/liblttng-ctl.la
 # Define test programs
 noinst_PROGRAMS = test_uri test_session test_kernel_data \
                   test_utils_parse_size_suffix test_utils_parse_time_suffix \
-                  test_utils_expand_path test_string_utils test_notification
+                  test_utils_expand_path test_utils_compat_poll \
+                  test_string_utils test_notification
 
 if HAVE_LIBLTTNG_UST_CTL
 noinst_PROGRAMS += test_ust_data
@@ -39,58 +41,95 @@ 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/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/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/bin/lttng-sessiond/thread.$(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/notify-apps.$(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
 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/common/libcommon.la \
 		$(top_builddir)/src/common/health/libhealth.la \
 		$(top_builddir)/src/bin/lttng-sessiond/notification-thread-commands.$(OBJEXT) \
-		$(top_builddir)/src/common/sessiond-comm/libsessiond-comm.la \
 		$(LIBLTTNG_CTL)
 
 test_kernel_data_SOURCES = test_kernel_data.c
@@ -99,22 +138,23 @@ test_kernel_data_LDADD = $(LIBTAP) $(LIBCOMMON) $(LIBRELAYD) $(LIBSESSIOND_COMM)
 test_kernel_data_LDADD += $(KERN_DATA_TRACE)
 
 # utils suffix for unit test
-UTILS_SUFFIX=$(top_builddir)/src/common/libcommon.la
 
 # 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) $(DL_LIBS)
-test_utils_parse_size_suffix_LDADD += $(UTILS_SUFFIX)
 
 # parse_time_suffix unit test
 test_utils_parse_time_suffix_SOURCES = test_utils_parse_time_suffix.c
 test_utils_parse_time_suffix_LDADD = $(LIBTAP) $(LIBHASHTABLE) $(LIBCOMMON)
-test_utils_parse_time_suffix_LDADD += $(UTILS_SUFFIX)
+
+# compat_poll unit test
+test_utils_compat_poll_SOURCES = test_utils_compat_poll.c
+test_utils_compat_poll_LDADD  = $(LIBTAP) $(LIBHASHTABLE) $(DL_LIBS) \
+		      $(top_builddir)/src/common/compat/libcompat.la $(LIBCOMMON)
 
 # expand_path unit test
 test_utils_expand_path_SOURCES = test_utils_expand_path.c
 test_utils_expand_path_LDADD = $(LIBTAP) $(LIBHASHTABLE) $(LIBCOMMON) $(DL_LIBS)
-test_utils_expand_path_LDADD += $(UTILS_SUFFIX)
 
 # string utilities unit test
 test_string_utils_SOURCES = test_string_utils.c