X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Funit%2FMakefile.am;h=d1b526d307a9d245ace77c20111ae15ce88e6baf;hp=b48917b90e81f70e2a3147f7f1c59af8d553d833;hb=HEAD;hpb=657270a48a6b33862ead3b28f3b54d42c54c66ff

diff --git a/tests/unit/Makefile.am b/tests/unit/Makefile.am
index b48917b90..d1b526d30 100644
--- a/tests/unit/Makefile.am
+++ b/tests/unit/Makefile.am
@@ -1,57 +1,191 @@
-AM_CFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src -I$(top_srcdir)/tests/utils/ -I$(srcdir)
-AM_LDFLAGS =
+# SPDX-License-Identifier: GPL-2.0-only
 
-if LTTNG_TOOLS_BUILD_WITH_LIBDL
-AM_LDFLAGS += -ldl
-endif
-if LTTNG_TOOLS_BUILD_WITH_LIBC_DL
-AM_LDFLAGS += -lc
-endif
+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)/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 \
+	test_notification \
+	test_payload \
+	test_relayd_backward_compat_group_by_session \
+	test_session \
+	test_string_utils \
+	test_unix_socket \
+	test_uri \
+	test_utils_compat_poll \
+	test_utils_compat_pthread \
+	test_utils_expand_path \
+	test_utils_parse_size_suffix \
+	test_utils_parse_time_suffix \
+	test_uuid
 
 LIBTAP=$(top_builddir)/tests/utils/tap/libtap.la
 
-LIBCOMMON=$(top_builddir)/src/common/libcommon.la
-LIBSESSIOND_COMM=$(top_builddir)/src/common/sessiond-comm/libsessiond-comm.la
-LIBHASHTABLE=$(top_builddir)/src/common/hashtable/libhashtable.la
+LIBCOMMON_GPL=$(top_builddir)/src/common/libcommon-gpl.la
+LIBSTRINGUTILS=$(top_builddir)/src/common/libstring-utils.la
+LIBFDTRACKER=$(top_builddir)/src/common/libfd-tracker.la
+LIBSESSIOND_COMM=$(top_builddir)/src/common/libsessiond-comm.la
+LIBRELAYD=$(top_builddir)/src/common/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
 
-EXTRA_DIST = run.sh
+# 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 \
+	test_notification \
+	test_payload \
+	test_relayd_backward_compat_group_by_session \
+	test_session \
+	test_string_utils \
+	test_unix_socket \
+	test_uri \
+	test_utils_compat_poll \
+	test_utils_compat_pthread \
+	test_utils_expand_path \
+	test_utils_parse_size_suffix \
+	test_utils_parse_time_suffix \
+	test_uuid
 
 if HAVE_LIBLTTNG_UST_CTL
-noinst_PROGRAMS = test_uri test_session test_ust_data test_kernel_data
-else
-noinst_PROGRAMS = test_uri test_session	test_kernel_data
+noinst_PROGRAMS += test_ust_data
+TESTS += test_ust_data
 endif
 
 # URI unit tests
-test_uri_SOURCES = test_uri.c
-test_uri_LDADD = $(LIBCOMMON)
+test_uri_SOURCES = test_uri.cpp
+test_uri_LDADD = $(LIBTAP) $(LIBCOMMON_GPL) $(DL_LIBS)
 
-# Session unit test
-SESSIONS=$(top_srcdir)/src/bin/lttng-sessiond/session.c 	\
-	 $(top_srcdir)/src/bin/lttng-sessiond/consumer.c 	\
-	 $(top_srcdir)/src/common/uri.c 			\
-	 $(top_srcdir)/src/common/utils.c 			\
-	 $(top_srcdir)/src/common/error.c
+RELAYD_OBJS = $(top_builddir)/src/bin/lttng-relayd/backward-compatibility-group-by.$(OBJEXT)
 
-test_session_SOURCES = test_session.c $(SESSIONS)
-test_session_LDADD = $(LIBTAP) $(LIBCOMMON) $(LIBSESSIOND_COMM) $(LIBHASHTABLE)
+test_session_SOURCES = test_session.cpp
+test_session_LDADD = $(LIBTAP) $(LIBLTTNG_SESSIOND_COMMON) $(DL_LIBS)
 
-# UST data structures unit test
 if HAVE_LIBLTTNG_UST_CTL
-UST_DATA_TRACE=$(top_srcdir)/src/bin/lttng-sessiond/trace-ust.c \
-	       $(top_srcdir)/src/bin/lttng-sessiond/consumer.c	\
-	       $(top_srcdir)/src/common/uri.c			\
-	       $(top_srcdir)/src/common/utils.c
+test_session_SOURCES += ust-sigbus.cpp
+test_session_LDADD += $(UST_CTL_LIBS)
+endif
 
-test_ust_data_SOURCES = test_ust_data.c $(UST_DATA_TRACE)
-test_ust_data_LDADD = $(LIBTAP) $(LIBCOMMON) $(LIBSESSIOND_COMM) $(LIBHASHTABLE)
+# UST data structures unit test
+if HAVE_LIBLTTNG_UST_CTL
+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_srcdir)/src/bin/lttng-sessiond/trace-kernel.c 	\
-		$(top_srcdir)/src/bin/lttng-sessiond/consumer.c 	\
-		$(top_srcdir)/src/common/uri.c 				\
-		$(top_srcdir)/src/common/utils.c
+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.cpp
+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.cpp
+test_utils_parse_time_suffix_LDADD = $(LIBTAP) $(LIBCOMMON_GPL)
+
+# compat_poll unit test
+test_utils_compat_poll_SOURCES = test_utils_compat_poll.cpp
+test_utils_compat_poll_LDADD  = $(LIBTAP) $(DL_LIBS) \
+		      $(top_builddir)/src/common/libcompat.la $(LIBCOMMON_GPL)
+
+# compat_pthread unit test
+test_utils_compat_pthread_SOURCES = test_utils_compat_pthread.cpp
+test_utils_compat_pthread_LDADD  = $(LIBTAP) \
+		      $(top_builddir)/src/common/libcompat.la $(LIBCOMMON_GPL)
+
+# expand_path unit test
+test_utils_expand_path_SOURCES = test_utils_expand_path.cpp
+test_utils_expand_path_LDADD = $(LIBTAP) $(LIBCOMMON_GPL) $(DL_LIBS)
+
+# directory handle unit test
+test_directory_handle_SOURCES = test_directory_handle.cpp
+test_directory_handle_LDADD = $(LIBTAP) $(LIBCOMMON_GPL) $(DL_LIBS)
+
+# string utilities unit test
+test_string_utils_SOURCES = test_string_utils.cpp
+test_string_utils_LDADD = $(LIBTAP) $(LIBCOMMON_GPL) $(LIBSTRINGUTILS) $(DL_LIBS)
+
+# Notification api
+test_notification_SOURCES = test_notification.cpp
+test_notification_LDADD = $(LIBTAP) $(LIBLTTNG_CTL) $(DL_LIBS)
+
+# Event rule api
+test_event_rule_SOURCES = test_event_rule.cpp
+test_event_rule_LDADD = $(LIBTAP) $(LIBCOMMON_GPL) $(LIBLTTNG_CTL) $(DL_LIBS) \
+		      $(top_builddir)/src/bin/lttng/lttng-loglevel.$(OBJEXT)
+
+# Condition api
+test_condition_SOURCES = test_condition.cpp
+test_condition_LDADD = $(LIBTAP) $(LIBCOMMON_GPL) $(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.cpp
+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
+
+# rate policy object unit test
+test_rate_policy_SOURCES = test_rate_policy.cpp
+test_rate_policy_LDADD = $(LIBTAP) $(LIBCOMMON_GPL) $(LIBLTTNG_CTL) $(DL_LIBS) \
+		      $(top_builddir)/src/bin/lttng/lttng-loglevel.$(OBJEXT)
+
+# fd tracker unit test
+test_fd_tracker_SOURCES = test_fd_tracker.cpp
+test_fd_tracker_LDADD = $(LIBTAP) $(LIBFDTRACKER) $(DL_LIBS) $(URCU_LIBS) $(LIBCOMMON_GPL)
+
+# uuid unit test
+test_uuid_SOURCES = test_uuid.cpp
+test_uuid_LDADD = $(LIBTAP) $(LIBCOMMON_GPL)
+
+# buffer view unit test
+test_buffer_view_SOURCES = test_buffer_view.cpp
+test_buffer_view_LDADD = $(LIBTAP) $(LIBCOMMON_GPL)
+
+# payload unit test
+test_payload_SOURCES = test_payload.cpp
+test_payload_LDADD = $(LIBTAP) $(LIBSESSIOND_COMM) $(LIBCOMMON_GPL)
+
+# unix socket test
+test_unix_socket_SOURCES = test_unix_socket.cpp
+test_unix_socket_LDADD = $(LIBTAP) $(LIBSESSIOND_COMM) $(LIBCOMMON_GPL)
+
+# Kernel probe location api test
+test_kernel_probe_SOURCES = test_kernel_probe.cpp
+test_kernel_probe_LDADD = $(LIBTAP) $(LIBCOMMON_GPL) $(LIBLTTNG_CTL) $(DL_LIBS)
+#
+# Event expression to bytecode test
+test_event_expr_to_bytecode_SOURCES = test_event_expr_to_bytecode.cpp
+test_event_expr_to_bytecode_LDADD = $(LIBTAP) $(LIBLTTNG_CTL) $(LIBCOMMON_GPL)
+
+# Log level rule api
+test_log_level_rule_SOURCES = test_log_level_rule.cpp
+test_log_level_rule_LDADD = $(LIBTAP) $(LIBCOMMON_GPL) $(LIBLTTNG_CTL) $(DL_LIBS)
 
-test_kernel_data_SOURCES = test_kernel_data.c $(KERN_DATA_TRACE)
-test_kernel_data_LDADD = $(LIBTAP) $(LIBCOMMON) $(LIBSESSIOND_COMM) $(LIBHASHTABLE)
+# Action api
+test_action_SOURCES = test_action.cpp
+test_action_LDADD = $(LIBTAP) $(LIBCOMMON_GPL) $(LIBLTTNG_CTL) $(DL_LIBS)