X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=tests%2Funit%2FMakefile.am;h=e555b0149479d30b69cf0d2232e14cb734770fb0;hb=488dbb6062973d4990a33284e4717d89a893339d;hp=4d3b56fde2b96913f697ed0c6d2ee3bac3ba6038;hpb=202486fa276e34e4c81d560bfd8897824c51af8c;p=lttng-tools.git diff --git a/tests/unit/Makefile.am b/tests/unit/Makefile.am index 4d3b56fde..e555b0149 100644 --- a/tests/unit/Makefile.am +++ b/tests/unit/Makefile.am @@ -43,6 +43,7 @@ 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 LIBLTTNG_CTL=$(top_builddir)/src/lib/lttng-ctl/liblttng-ctl.la +LIBLTTNG_SESSIOND_COMMON=$(top_builddir)/src/bin/lttng-sessiond/liblttng-sessiond-common.la # Define test programs noinst_PROGRAMS = \ @@ -77,202 +78,115 @@ TESTS += test_ust_data endif # URI unit tests -test_uri_SOURCES = test_uri.c +test_uri_SOURCES = test_uri.cpp test_uri_LDADD = $(LIBTAP) $(LIBCOMMON) $(LIBHASHTABLE) $(DL_LIBS) -# 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/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/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) \ - $(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/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) \ - $(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/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 \ - $(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 - RELAYD_OBJS = $(top_builddir)/src/bin/lttng-relayd/backward-compatibility-group-by.$(OBJEXT) -test_session_SOURCES = test_session.c -test_session_LDADD = $(LIBTAP) $(LIBCOMMON) $(LIBRELAYD) $(LIBSESSIOND_COMM) \ - $(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 \ - $(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) +test_session_SOURCES = test_session.cpp +test_session_LDADD = $(LIBTAP) $(LIBLTTNG_SESSIOND_COMMON) $(DL_LIBS) if HAVE_LIBLTTNG_UST_CTL -test_session_SOURCES += ust-sigbus.c +test_session_SOURCES += ust-sigbus.cpp test_session_LDADD += $(UST_CTL_LIBS) 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 $(URCU_LIBS) \ - $(UST_CTL_LIBS) \ - $(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) +test_ust_data_SOURCES = test_ust_data.cpp +test_ust_data_LDADD = $(LIBTAP) $(LIBLTTNG_SESSIOND_COMMON) $(DL_LIBS) endif -# Kernel data structures unit test -KERN_DATA_TRACE=$(top_builddir)/src/bin/lttng-sessiond/trace-kernel.$(OBJEXT) \ - $(top_builddir)/src/common/compat/libcompat.la \ - $(top_builddir)/src/bin/lttng-sessiond/consumer.$(OBJEXT) \ - $(top_builddir)/src/bin/lttng-sessiond/globals.$(OBJEXT) \ - $(top_builddir)/src/bin/lttng-sessiond/utils.$(OBJEXT) \ - $(top_builddir)/src/bin/lttng-sessiond/tracker.$(OBJEXT) \ - $(top_builddir)/src/common/health/libhealth.la \ - $(top_builddir)/src/bin/lttng-sessiond/notification-thread-commands.$(OBJEXT) \ - $(LIBLTTNG_CTL) - -test_kernel_data_SOURCES = test_kernel_data.c -test_kernel_data_LDADD = $(LIBTAP) $(LIBCOMMON) $(LIBRELAYD) $(LIBSESSIOND_COMM) \ - $(LIBHASHTABLE) $(DL_LIBS) -lrt -test_kernel_data_LDADD += $(KERN_DATA_TRACE) +test_kernel_data_SOURCES = test_kernel_data.cpp +test_kernel_data_LDADD = $(LIBTAP) $(LIBLTTNG_SESSIOND_COMMON) $(DL_LIBS) # utils suffix for unit test # parse_size_suffix unit test -test_utils_parse_size_suffix_SOURCES = test_utils_parse_size_suffix.c +test_utils_parse_size_suffix_SOURCES = test_utils_parse_size_suffix.cpp test_utils_parse_size_suffix_LDADD = $(LIBTAP) $(LIBHASHTABLE) $(LIBCOMMON) $(DL_LIBS) # parse_time_suffix unit test -test_utils_parse_time_suffix_SOURCES = test_utils_parse_time_suffix.c +test_utils_parse_time_suffix_SOURCES = test_utils_parse_time_suffix.cpp test_utils_parse_time_suffix_LDADD = $(LIBTAP) $(LIBHASHTABLE) $(LIBCOMMON) # compat_poll unit test -test_utils_compat_poll_SOURCES = test_utils_compat_poll.c +test_utils_compat_poll_SOURCES = test_utils_compat_poll.cpp 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_SOURCES = test_utils_compat_pthread.cpp 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_SOURCES = test_utils_expand_path.cpp test_utils_expand_path_LDADD = $(LIBTAP) $(LIBHASHTABLE) $(LIBCOMMON) $(DL_LIBS) # directory handle unit test -test_directory_handle_SOURCES = test_directory_handle.c +test_directory_handle_SOURCES = test_directory_handle.cpp test_directory_handle_LDADD = $(LIBTAP) $(LIBHASHTABLE) $(LIBCOMMON) $(DL_LIBS) # string utilities unit test -test_string_utils_SOURCES = test_string_utils.c +test_string_utils_SOURCES = test_string_utils.cpp test_string_utils_LDADD = $(LIBTAP) $(LIBCOMMON) $(LIBSTRINGUTILS) $(DL_LIBS) # Notification api -test_notification_SOURCES = test_notification.c +test_notification_SOURCES = test_notification.cpp test_notification_LDADD = $(LIBTAP) $(LIBLTTNG_CTL) $(DL_LIBS) # Event rule api -test_event_rule_SOURCES = test_event_rule.c +test_event_rule_SOURCES = test_event_rule.cpp 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 +test_condition_SOURCES = test_condition.cpp test_condition_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 +test_relayd_backward_compat_group_by_session_SOURCES = test_relayd_backward_compat_group_by_session.cpp 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_SOURCES = test_rate_policy.cpp 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_SOURCES = test_fd_tracker.cpp test_fd_tracker_LDADD = $(LIBTAP) $(LIBFDTRACKER) $(DL_LIBS) $(URCU_LIBS) $(LIBCOMMON) $(LIBHASHTABLE) # uuid unit test -test_uuid_SOURCES = test_uuid.c +test_uuid_SOURCES = test_uuid.cpp test_uuid_LDADD = $(LIBTAP) $(LIBCOMMON) # buffer view unit test -test_buffer_view_SOURCES = test_buffer_view.c +test_buffer_view_SOURCES = test_buffer_view.cpp test_buffer_view_LDADD = $(LIBTAP) $(LIBCOMMON) # payload unit test -test_payload_SOURCES = test_payload.c +test_payload_SOURCES = test_payload.cpp test_payload_LDADD = $(LIBTAP) $(LIBSESSIOND_COMM) $(LIBCOMMON) # unix socket test -test_unix_socket_SOURCES = test_unix_socket.c +test_unix_socket_SOURCES = test_unix_socket.cpp test_unix_socket_LDADD = $(LIBTAP) $(LIBSESSIOND_COMM) $(LIBCOMMON) # Kernel probe location api test -test_kernel_probe_SOURCES = test_kernel_probe.c +test_kernel_probe_SOURCES = test_kernel_probe.cpp test_kernel_probe_LDADD = $(LIBTAP) $(LIBCOMMON) $(LIBLTTNG_CTL) $(DL_LIBS) # # Event expression to bytecode test -test_event_expr_to_bytecode_SOURCES = test_event_expr_to_bytecode.c +test_event_expr_to_bytecode_SOURCES = test_event_expr_to_bytecode.cpp 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_SOURCES = test_log_level_rule.cpp test_log_level_rule_LDADD = $(LIBTAP) $(LIBCOMMON) $(LIBLTTNG_CTL) $(DL_LIBS) # Action api -test_action_SOURCES = test_action.c +test_action_SOURCES = test_action.cpp test_action_LDADD = $(LIBTAP) $(LIBCOMMON) $(LIBLTTNG_CTL) $(DL_LIBS)