X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=tests%2Funit%2FMakefile.am;h=4d3b56fde2b96913f697ed0c6d2ee3bac3ba6038;hb=202486fa276e34e4c81d560bfd8897824c51af8c;hp=6d33beafb6cb03d6efdec2cb7a43c0d62865602f;hpb=85b053182c4e300c717483ad231f5c04cbf5e4b7;p=lttng-tools.git

diff --git a/tests/unit/Makefile.am b/tests/unit/Makefile.am
index 6d33beafb..4d3b56fde 100644
--- a/tests/unit/Makefile.am
+++ b/tests/unit/Makefile.am
@@ -6,15 +6,17 @@ AM_CPPFLAGS += -I$(top_srcdir)/tests/utils/ -I$(srcdir)
 
 LOG_DRIVER_FLAGS='--merge'
 LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) \
-	$(top_srcdir)/config/tap-driver.sh
+	$(top_srcdir)/tests/utils/tap-driver.sh
 
 TESTS = \
 	ini_config/test_ini_config \
+	test_action \
 	test_buffer_view \
 	test_directory_handle \
 	test_event_expr_to_bytecode \
 	test_event_rule \
 	test_fd_tracker \
+	test_rate_policy \
 	test_kernel_data \
 	test_kernel_probe \
 	test_log_level_rule \
@@ -44,12 +46,14 @@ LIBLTTNG_CTL=$(top_builddir)/src/lib/lttng-ctl/liblttng-ctl.la
 
 # Define test programs
 noinst_PROGRAMS = \
+	test_action \
 	test_buffer_view \
 	test_condition \
 	test_directory_handle \
 	test_event_expr_to_bytecode \
 	test_event_rule \
 	test_fd_tracker \
+	test_rate_policy \
 	test_kernel_data \
 	test_kernel_probe \
 	test_log_level_rule \
@@ -82,7 +86,6 @@ SESSIOND_OBJS = $(top_builddir)/src/bin/lttng-sessiond/buffer-registry.$(OBJEXT)
 	 $(top_builddir)/src/bin/lttng-sessiond/condition-internal.$(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) \
@@ -99,6 +102,7 @@ SESSIOND_OBJS = $(top_builddir)/src/bin/lttng-sessiond/buffer-registry.$(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/event-notifier-error-accounting.$(OBJEXT) \
 	 $(top_builddir)/src/bin/lttng-sessiond/timer.$(OBJEXT) \
 	 $(top_builddir)/src/bin/lttng-sessiond/snapshot.$(OBJEXT) \
 	 $(top_builddir)/src/bin/lttng-sessiond/sessiond-config.$(OBJEXT) \
@@ -110,6 +114,7 @@ SESSIOND_OBJS = $(top_builddir)/src/bin/lttng-sessiond/buffer-registry.$(OBJEXT)
 	 $(top_builddir)/src/bin/lttng-sessiond/process-utils.$(OBJEXT) \
 	 $(top_builddir)/src/bin/lttng-sessiond/thread.$(OBJEXT) \
 	 $(top_builddir)/src/bin/lttng-sessiond/tracker.$(OBJEXT) \
+	 $(top_builddir)/src/bin/lttng-sessiond/trigger-error-query.$(OBJEXT) \
 	 $(top_builddir)/src/common/libcommon.la \
 	 $(top_builddir)/src/common/testpoint/libtestpoint.la \
 	 $(top_builddir)/src/common/compat/libcompat.la \
@@ -144,6 +149,7 @@ test_session_LDADD = $(LIBTAP) $(LIBCOMMON) $(LIBRELAYD) $(LIBSESSIOND_COMM) \
 test_session_LDADD += $(SESSIOND_OBJS)
 
 if HAVE_LIBLTTNG_UST_CTL
+test_session_SOURCES += ust-sigbus.c
 test_session_LDADD += $(UST_CTL_LIBS)
 endif
 
@@ -215,10 +221,11 @@ 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)
+test_event_rule_LDADD = $(LIBTAP) $(LIBCOMMON) $(LIBLTTNG_CTL) $(DL_LIBS) \
+		      $(top_builddir)/src/bin/lttng/lttng-loglevel.$(OBJEXT)
 
 # Condition api
 test_condition_SOURCES = test_condition.c
@@ -229,6 +236,11 @@ test_relayd_backward_compat_group_by_session_SOURCES = test_relayd_backward_comp
 test_relayd_backward_compat_group_by_session_LDADD = $(LIBTAP) $(LIBCOMMON) $(RELAYD_OBJS)
 test_relayd_backward_compat_group_by_session_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/src/bin/lttng-relayd
 
+# rate policy object unit test
+test_rate_policy_SOURCES = test_rate_policy.c
+test_rate_policy_LDADD = $(LIBTAP) $(LIBCOMMON) $(LIBLTTNG_CTL) $(DL_LIBS) \
+		      $(top_builddir)/src/bin/lttng/lttng-loglevel.$(OBJEXT)
+
 # fd tracker unit test
 test_fd_tracker_SOURCES = test_fd_tracker.c
 test_fd_tracker_LDADD = $(LIBTAP) $(LIBFDTRACKER) $(DL_LIBS) $(URCU_LIBS) $(LIBCOMMON) $(LIBHASHTABLE)
@@ -260,3 +272,7 @@ test_event_expr_to_bytecode_LDADD = $(LIBTAP) $(LIBLTTNG_CTL) $(LIBCOMMON)
 # Log level rule api
 test_log_level_rule_SOURCES = test_log_level_rule.c
 test_log_level_rule_LDADD = $(LIBTAP) $(LIBCOMMON) $(LIBLTTNG_CTL) $(DL_LIBS)
+
+# Action api
+test_action_SOURCES = test_action.c
+test_action_LDADD = $(LIBTAP) $(LIBCOMMON) $(LIBLTTNG_CTL) $(DL_LIBS)