X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Fnotification%2FMakefile.am;h=a59ee8d6daeb825e4e3e29c07f4f2bbad70f8831;hp=dc79067f6abe464a313f703664de47ff6bac96f1;hb=6a5596ac51788ca040b88b98e59c8db42a5a160a;hpb=3e4ee3b37bab181a2da93b09e4714af5dbbc29c0

diff --git a/tests/regression/tools/notification/Makefile.am b/tests/regression/tools/notification/Makefile.am
index dc79067f6..a59ee8d6d 100644
--- a/tests/regression/tools/notification/Makefile.am
+++ b/tests/regression/tools/notification/Makefile.am
@@ -1,17 +1,33 @@
 # SPDX-License-Identifier: GPL-2.0-only
 
-AM_CFLAGS += -I$(top_srcdir)/tests/utils
+AM_CPPFLAGS += -I$(top_srcdir)/tests/utils
 
 LIBTAP=$(top_builddir)/tests/utils/tap/libtap.la
 LIB_LTTNG_CTL = $(top_builddir)/src/lib/lttng-ctl/liblttng-ctl.la
 
-noinst_PROGRAMS = base_client notification rotation
+noinst_PROGRAMS = base_client notification rotation default_pipe_size_getter
 
 if NO_SHARED
 
-CLEANFILES = libpause_consumer.so libpause_consumer.so.debug
-EXTRA_DIST = test_notification_ust_error test_notification_ust_buffer_usage test_notification_ust_event_rule_condition_exclusion test_notification_kernel_error test_notification_kernel_buffer_usage test_notification_multi_app base_client.c notification.c consumer_testpoints.c util_event_generator.sh
-
+CLEANFILES = libpause_consumer.so libpause_consumer.so.debug libpause_sessiond.so libpause_sessiond.so.debug
+EXTRA_DIST = \
+	     base_client.c \
+	     consumer_testpoints.cpp \
+	     sessiond_testpoints.cpp \
+	     notification.cpp \
+	     test_notification_kernel_buffer_usage \
+	     test_notification_kernel_capture \
+	     test_notification_kernel_error \
+	     test_notification_kernel_instrumentation \
+	     test_notification_kernel_syscall \
+	     test_notification_kernel_userspace_probe \
+	     test_notification_multi_app \
+	     test_notification_notifier_discarded_count \
+	     test_notification_ust_buffer_usage \
+	     test_notification_ust_capture \
+	     test_notification_ust_error \
+	     test_notification_ust_event_rule_condition_exclusion \
+	     util_event_generator.sh
 else
 
 # In order to test the health check feature, the helper library
@@ -19,27 +35,65 @@ else
 FORCE_SHARED_LIB_OPTIONS = -module -shared -avoid-version \
 			   -rpath $(abs_builddir)
 
-libpause_consumer_la_SOURCES = consumer_testpoints.c
+libpause_consumer_la_SOURCES = consumer_testpoints.cpp
 libpause_consumer_la_LIBADD = \
 	$(top_builddir)/src/common/sessiond-comm/libsessiond-comm.la \
-	$(top_builddir)/src/common/libcommon.la \
+	$(top_builddir)/src/common/libcommon-gpl.la \
 	$(top_builddir)/src/lib/lttng-ctl/liblttng-ctl.la \
 	$(DL_LIBS)
 libpause_consumer_la_LDFLAGS = $(FORCE_SHARED_LIB_OPTIONS)
-noinst_LTLIBRARIES = libpause_consumer.la
+
+libpause_sessiond_la_SOURCES = sessiond_testpoints.cpp
+libpause_sessiond_la_LIBADD = \
+	$(top_builddir)/src/common/libcommon-gpl.la \
+	$(top_builddir)/src/lib/lttng-ctl/liblttng-ctl.la \
+	$(DL_LIBS)
+libpause_sessiond_la_LDFLAGS = $(FORCE_SHARED_LIB_OPTIONS)
+noinst_LTLIBRARIES = libpause_sessiond.la libpause_consumer.la
 
 base_client_SOURCES = base_client.c
 base_client_LDADD = $(LIB_LTTNG_CTL)
 
-notification_SOURCES = notification.c
+notification_SOURCES = notification.cpp
+# Tests the deprecated lttng_register_trigger() interface
+notification_CXXFLAGS = -Wno-deprecated-declarations $(AM_CXXFLAGS)
 notification_LDADD = $(LIB_LTTNG_CTL) $(LIBTAP) -lm
 
 rotation_SOURCES = rotation.c
 rotation_LDADD = $(LIB_LTTNG_CTL) $(LIBTAP) -lm
 
-noinst_SCRIPTS = test_notification_ust_error test_notification_ust_buffer_usage test_notification_ust_event_rule_condition_exclusion test_notification_kernel_error test_notification_kernel_buffer_usage test_notification_multi_app test_rotation util_event_generator.sh
-EXTRA_DIST = test_notification_ust_error test_notification_ust_buffer_usage test_notification_ust_event_rule_condition_exclusion test_notification_kernel_error test_notification_kernel_buffer_usage test_notification_multi_app test_rotation util_event_generator.sh
+default_pipe_size_getter_SOURCES = default_pipe_size_getter.cpp
+default_pipe_size_getter_LDADD = $(top_builddir)/src/common/libcommon-gpl.la
+
+noinst_SCRIPTS = \
+	test_notification_kernel_buffer_usage \
+	test_notification_kernel_error \
+	test_notification_kernel_instrumentation \
+	test_notification_kernel_syscall \
+	test_notification_kernel_userspace_probe \
+	test_notification_multi_app \
+	test_notification_notifier_discarded_count \
+	test_notification_ust_buffer_usage \
+	test_notification_ust_error \
+	test_notification_ust_event_rule_condition_exclusion \
+	test_rotation \
+	util_event_generator.sh
 
+EXTRA_DIST = \
+	test_notification_kernel_buffer_usage \
+	test_notification_kernel_capture \
+	test_notification_kernel_error \
+	test_notification_kernel_instrumentation \
+	test_notification_kernel_syscall \
+	test_notification_kernel_userspace_probe \
+	test_notification_multi_app \
+	test_notification_notifier_discarded_count \
+	test_notification_ust_buffer_usage \
+	test_notification_ust_capture \
+	test_notification_ust_error \
+	test_notification_ust_event_rule_condition_exclusion \
+	test_rotation \
+	util_event_generator.sh
 
 all-local:
 	@if [ x"$(srcdir)" != x"$(builddir)" ]; then \