X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=tests%2Funit%2FMakefile.am;h=e1e60ff93319c68d7385ce083dfd0f07eeae414a;hb=04952f7cd83dd9697d314deb8ae988f888057d97;hp=4ded1dfb12f1d0b77a186b674416d47b7c488a11;hpb=658f12fa973b58f324b6f018672cc03222cfc7b4;p=lttng-tools.git diff --git a/tests/unit/Makefile.am b/tests/unit/Makefile.am index 4ded1dfb1..e1e60ff93 100644 --- a/tests/unit/Makefile.am +++ b/tests/unit/Makefile.am @@ -1,10 +1,12 @@ +# SPDX-License-Identifier: GPL-2.0-only + SUBDIRS = ini_config 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 = test_kernel_data \ test_session \ @@ -15,14 +17,18 @@ TESTS = test_kernel_data \ test_utils_compat_poll \ test_string_utils \ test_notification \ - ini_config/test_ini_config + test_directory_handle \ + test_relayd_backward_compat_group_by_session \ + ini_config/test_ini_config \ + test_fd_tracker \ + test_uuid LIBTAP=$(top_builddir)/tests/utils/tap/libtap.la -LIBCOMMON=$(top_builddir)/src/common/libcommon.la +LIBCOMMON_GPL=$(top_builddir)/src/common/libcommon-gpl.la LIBSTRINGUTILS=$(top_builddir)/src/common/string-utils/libstring-utils.la +LIBFDTRACKER=$(top_builddir)/src/common/fd-tracker/libfd-tracker.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 LIBLTTNG_CTL=$(top_builddir)/src/lib/lttng-ctl/liblttng-ctl.la @@ -30,7 +36,9 @@ LIBLTTNG_CTL=$(top_builddir)/src/lib/lttng-ctl/liblttng-ctl.la 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_string_utils test_notification + test_string_utils test_notification test_directory_handle \ + test_relayd_backward_compat_group_by_session \ + test_fd_tracker test_uuid if HAVE_LIBLTTNG_UST_CTL noinst_PROGRAMS += test_ust_data @@ -39,7 +47,7 @@ endif # URI unit tests test_uri_SOURCES = test_uri.c -test_uri_LDADD = $(LIBTAP) $(LIBCOMMON) $(LIBHASHTABLE) $(DL_LIBS) +test_uri_LDADD = $(LIBTAP) $(LIBCOMMON_GPL) $(DL_LIBS) # Sessiond objects SESSIOND_OBJS = $(top_builddir)/src/bin/lttng-sessiond/buffer-registry.$(OBJEXT) \ @@ -72,7 +80,8 @@ SESSIOND_OBJS = $(top_builddir)/src/bin/lttng-sessiond/buffer-registry.$(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/common/libcommon.la \ + $(top_builddir)/src/bin/lttng-sessiond/tracker.$(OBJEXT) \ + $(top_builddir)/src/common/libcommon-gpl.la \ $(top_builddir)/src/common/testpoint/libtestpoint.la \ $(top_builddir)/src/common/compat/libcompat.la \ $(top_builddir)/src/common/health/libhealth.la \ @@ -89,6 +98,8 @@ SESSIOND_OBJS += $(top_builddir)/src/bin/lttng-sessiond/trace-ust.$(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 -lurcu-common -lurcu \ @@ -104,7 +115,7 @@ test_session_LDADD = $(LIBTAP) $(LIBCOMMON) $(LIBRELAYD) $(LIBSESSIOND_COMM) \ test_session_LDADD += $(SESSIOND_OBJS) if HAVE_LIBLTTNG_UST_CTL -test_session_LDADD += -llttng-ust-ctl +test_session_LDADD += $(UST_CTL_LIBS) endif # UST data structures unit test @@ -112,7 +123,7 @@ 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 \ - -llttng-ust-ctl \ + $(UST_CTL_LIBS) \ $(KMOD_LIBS) \ $(top_builddir)/src/lib/lttng-ctl/liblttng-ctl.la \ $(top_builddir)/src/common/kernel-ctl/libkernel-ctl.la \ @@ -130,12 +141,13 @@ 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/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) \ +test_kernel_data_LDADD = $(LIBTAP) $(LIBCOMMON_GPL) $(LIBRELAYD) $(LIBSESSIOND_COMM) \ $(LIBHASHTABLE) $(DL_LIBS) -lrt test_kernel_data_LDADD += $(KERN_DATA_TRACE) @@ -143,25 +155,42 @@ test_kernel_data_LDADD += $(KERN_DATA_TRACE) # parse_size_suffix unit test test_utils_parse_size_suffix_SOURCES = test_utils_parse_size_suffix.c -test_utils_parse_size_suffix_LDADD = $(LIBTAP) $(LIBHASHTABLE) $(LIBCOMMON) $(DL_LIBS) +test_utils_parse_size_suffix_LDADD = $(LIBTAP) $(LIBCOMMON_GPL) $(DL_LIBS) # parse_time_suffix unit test test_utils_parse_time_suffix_SOURCES = test_utils_parse_time_suffix.c -test_utils_parse_time_suffix_LDADD = $(LIBTAP) $(LIBHASHTABLE) $(LIBCOMMON) +test_utils_parse_time_suffix_LDADD = $(LIBTAP) $(LIBCOMMON_GPL) # compat_poll unit test 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) +test_utils_compat_poll_LDADD = $(LIBTAP) $(DL_LIBS) \ + $(top_builddir)/src/common/compat/libcompat.la $(LIBCOMMON_GPL) # expand_path unit test test_utils_expand_path_SOURCES = test_utils_expand_path.c -test_utils_expand_path_LDADD = $(LIBTAP) $(LIBHASHTABLE) $(LIBCOMMON) $(DL_LIBS) +test_utils_expand_path_LDADD = $(LIBTAP) $(LIBCOMMON_GPL) $(DL_LIBS) + +# directory handle unit test +test_directory_handle_SOURCES = test_directory_handle.c +test_directory_handle_LDADD = $(LIBTAP) $(LIBCOMMON_GPL) $(DL_LIBS) # string utilities unit test test_string_utils_SOURCES = test_string_utils.c -test_string_utils_LDADD = $(LIBTAP) $(LIBCOMMON) $(LIBSTRINGUTILS) $(DL_LIBS) +test_string_utils_LDADD = $(LIBTAP) $(LIBCOMMON_GPL) $(LIBSTRINGUTILS) $(DL_LIBS) # Notification api test_notification_SOURCES = test_notification.c test_notification_LDADD = $(LIBTAP) $(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_LDADD = $(LIBTAP) $(LIBCOMMON_GPL) $(RELAYD_OBJS) +test_relayd_backward_compat_group_by_session_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/src/bin/lttng-relayd + +# fd tracker unit test +test_fd_tracker_SOURCES = test_fd_tracker.c +test_fd_tracker_LDADD = $(LIBTAP) $(LIBFDTRACKER) $(DL_LIBS) -lurcu $(LIBCOMMON_GPL) + +# uuid unit test +test_uuid_SOURCES = test_uuid.c +test_uuid_LDADD = $(LIBTAP) $(LIBCOMMON_GPL)