X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Funit%2FMakefile.am;h=8e2703726e9d8e64bf88e9c8377abb25314585dd;hp=e2c57bc8e7d68b28c1b0c3e08c18cd3cec06ce0e;hb=014d7d3b5e9d69989bf776cffb6c21ff7e1d36ff;hpb=67d8e2ef48ea2cd334bf9efd90b58b976437a3cd

diff --git a/tests/unit/Makefile.am b/tests/unit/Makefile.am
index e2c57bc8e..8e2703726 100644
--- a/tests/unit/Makefile.am
+++ b/tests/unit/Makefile.am
@@ -15,14 +15,19 @@ TESTS = test_kernel_data \
 	test_utils_parse_time_suffix \
 	test_utils_expand_path \
 	test_utils_compat_poll \
+	test_utils_compat_pthread \
 	test_string_utils \
 	test_notification \
+	test_event_rule \
 	test_directory_handle \
 	test_relayd_backward_compat_group_by_session \
 	ini_config/test_ini_config \
 	test_fd_tracker \
 	test_uuid \
-	test_buffer_view
+	test_buffer_view \
+	test_payload \
+	test_unix_socket \
+	test_kernel_probe
 
 LIBTAP=$(top_builddir)/tests/utils/tap/libtap.la
 
@@ -37,11 +42,15 @@ 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_utils_compat_poll \
+                  test_utils_expand_path test_utils_compat_poll test_utils_compat_pthread \
                   test_string_utils test_notification test_directory_handle \
                   test_relayd_backward_compat_group_by_session \
                   test_fd_tracker test_uuid \
-                  test_buffer_view
+                  test_buffer_view \
+                  test_payload \
+                  test_unix_socket \
+                  test_kernel_probe \
+                  test_event_rule 
 
 if HAVE_LIBLTTNG_UST_CTL
 noinst_PROGRAMS += test_ust_data
@@ -61,6 +70,7 @@ SESSIOND_OBJS = $(top_builddir)/src/bin/lttng-sessiond/buffer-registry.$(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/action-executor.$(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) \
@@ -105,7 +115,7 @@ RELAYD_OBJS = $(top_builddir)/src/bin/lttng-relayd/backward-compatibility-group-
 
 test_session_SOURCES = test_session.c
 test_session_LDADD = $(LIBTAP) $(LIBCOMMON) $(LIBRELAYD) $(LIBSESSIOND_COMM) \
-		     $(LIBHASHTABLE) $(DL_LIBS) -lrt -lurcu-common -lurcu \
+		     $(LIBHASHTABLE) $(DL_LIBS) -lrt $(URCU_LIBS) \
 		     $(KMOD_LIBS) \
 		     $(top_builddir)/src/lib/lttng-ctl/liblttng-ctl.la \
 		     $(top_builddir)/src/common/kernel-ctl/libkernel-ctl.la \
@@ -125,7 +135,7 @@ endif
 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 -lurcu-common -lurcu \
+		      $(LIBHASHTABLE) $(DL_LIBS) -lrt $(URCU_LIBS) \
 		      $(UST_CTL_LIBS) \
 		      $(KMOD_LIBS) \
 		      $(top_builddir)/src/lib/lttng-ctl/liblttng-ctl.la \
@@ -169,6 +179,11 @@ 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)
 
+# compat_pthread unit test
+test_utils_compat_pthread_SOURCES = test_utils_compat_pthread.c
+test_utils_compat_pthread_LDADD  = $(LIBTAP) \
+		      $(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)
@@ -184,6 +199,10 @@ test_string_utils_LDADD = $(LIBTAP) $(LIBCOMMON) $(LIBSTRINGUTILS) $(DL_LIBS)
 # Notification api
 test_notification_SOURCES = test_notification.c
 test_notification_LDADD = $(LIBTAP) $(LIBLTTNG_CTL) $(DL_LIBS)
+#
+# Event rule api
+test_event_rule_SOURCES = test_event_rule.c
+test_event_rule_LDADD = $(LIBTAP) $(LIBCOMMON) $(LIBLTTNG_CTL) $(DL_LIBS)
 
 # relayd backward compat for groou-by-session utilities
 test_relayd_backward_compat_group_by_session_SOURCES = test_relayd_backward_compat_group_by_session.c
@@ -192,7 +211,7 @@ test_relayd_backward_compat_group_by_session_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_s
 
 # fd tracker unit test
 test_fd_tracker_SOURCES = test_fd_tracker.c
-test_fd_tracker_LDADD = $(LIBTAP) $(LIBFDTRACKER) $(DL_LIBS) -lurcu $(LIBCOMMON) $(LIBHASHTABLE)
+test_fd_tracker_LDADD = $(LIBTAP) $(LIBFDTRACKER) $(DL_LIBS) $(URCU_LIBS) $(LIBCOMMON) $(LIBHASHTABLE)
 
 # uuid unit test
 test_uuid_SOURCES = test_uuid.c
@@ -201,3 +220,15 @@ test_uuid_LDADD = $(LIBTAP) $(LIBCOMMON)
 # buffer view unit test
 test_buffer_view_SOURCES = test_buffer_view.c
 test_buffer_view_LDADD = $(LIBTAP) $(LIBCOMMON)
+
+# payload unit test
+test_payload_SOURCES = test_payload.c
+test_payload_LDADD = $(LIBTAP) $(LIBSESSIOND_COMM) $(LIBCOMMON)
+
+# unix socket test
+test_unix_socket_SOURCES = test_unix_socket.c
+test_unix_socket_LDADD = $(LIBTAP) $(LIBSESSIOND_COMM) $(LIBCOMMON)
+
+# Kernel probe location api test
+test_kernel_probe_SOURCES = test_kernel_probe.c
+test_kernel_probe_LDADD = $(LIBTAP) $(LIBCOMMON) $(LIBLTTNG_CTL) $(DL_LIBS)