X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=tests%2Funit%2FMakefile.am;h=a38785a1e72014c5c7f39044d88f52831ccc0af0;hb=b55e7034ae4b3bf9fb7c88c9fd102896cf322efe;hp=b6981075dcd2b759dea358c7e85bed8b51a14222;hpb=9354f1d04c5e433da72d0b466f661e30e548097c;p=lttng-tools.git

diff --git a/tests/unit/Makefile.am b/tests/unit/Makefile.am
index b6981075d..a38785a1e 100644
--- a/tests/unit/Makefile.am
+++ b/tests/unit/Makefile.am
@@ -12,6 +12,7 @@ TESTS = test_kernel_data \
 	test_uri \
 	test_utils_parse_size_suffix \
 	test_utils_expand_path \
+	test_string_utils \
 	ini_config/test_ini_config
 
 if LTTNG_TOOLS_BUILD_WITH_LIBDL
@@ -24,6 +25,7 @@ endif
 LIBTAP=$(top_builddir)/tests/utils/tap/libtap.la
 
 LIBCOMMON=$(top_builddir)/src/common/libcommon.la
+LIBSTRINGUTILS=$(top_builddir)/src/common/string-utils/libstring-utils.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
@@ -31,6 +33,7 @@ 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_string_utils
 
 if HAVE_LIBLTTNG_UST_CTL
 noinst_PROGRAMS += test_ust_data
@@ -42,11 +45,14 @@ test_uri_SOURCES = test_uri.c
 test_uri_LDADD = $(LIBTAP) $(LIBCOMMON) $(LIBHASHTABLE)
 
 # Session unit test
-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 \
+SESSIONS=$(top_builddir)/src/bin/lttng-sessiond/session.$(OBJEXT) \
+	 $(top_builddir)/src/bin/lttng-sessiond/consumer.$(OBJEXT) \
+	 $(top_builddir)/src/bin/lttng-sessiond/utils.$(OBJEXT) \
+	 $(top_builddir)/src/bin/lttng-sessiond/snapshot.$(OBJEXT) \
+	 $(top_builddir)/src/bin/lttng-sessiond/ht-cleanup.$(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
 
@@ -58,18 +64,19 @@ test_session_LDADD += $(SESSIONS)
 
 # UST data structures unit test
 if HAVE_LIBLTTNG_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 \
+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-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
@@ -81,11 +88,12 @@ test_ust_data_LDADD += $(UST_DATA_TRACE)
 endif
 
 # Kernel data structures unit test
-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 \
+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
 
 test_kernel_data_SOURCES = test_kernel_data.c
@@ -105,3 +113,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)
+
+# string utilities unit test
+test_string_utils_SOURCES = test_string_utils.c
+test_string_utils_LDADD = $(LIBTAP) $(LIBCOMMON) $(LIBSTRINGUTILS)