X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Funit%2FMakefile.am;h=97b84b6cf6ee969b7460c91ee2092ad80c9ed924;hp=3387720683aa7acf31cbebe93ac7d960f28d47f9;hb=26d0e3569499275a072d80c811825045e3291aed;hpb=f2b3ef9f7d7adf6cc0678cd5933b638f5a9e75a6 diff --git a/tests/unit/Makefile.am b/tests/unit/Makefile.am index 338772068..97b84b6cf 100644 --- a/tests/unit/Makefile.am +++ b/tests/unit/Makefile.am @@ -8,23 +8,28 @@ LOG_DRIVER_FLAGS='--merge' LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) \ $(top_srcdir)/config/tap-driver.sh -TESTS = test_kernel_data \ +TESTS = \ + ini_config/test_ini_config \ + test_buffer_view \ + test_directory_handle \ + test_event_expr_to_bytecode \ + test_event_rule \ + test_fd_tracker \ + test_kernel_data \ + test_kernel_probe \ + 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_utils_expand_path \ - test_utils_compat_poll \ - test_string_utils \ - test_notification \ - test_directory_handle \ - test_relayd_backward_compat_group_by_session \ - ini_config/test_ini_config \ - test_fd_tracker \ - test_uuid \ - test_buffer_view \ - test_payload \ - test_unix_socket + test_uuid LIBTAP=$(top_builddir)/tests/utils/tap/libtap.la @@ -37,15 +42,28 @@ LIBRELAYD=$(top_builddir)/src/common/relayd/librelayd.la LIBLTTNG_CTL=$(top_builddir)/src/lib/lttng-ctl/liblttng-ctl.la # Define test programs -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_directory_handle \ - test_relayd_backward_compat_group_by_session \ - test_fd_tracker test_uuid \ - test_buffer_view \ - test_payload \ - test_unix_socket +noinst_PROGRAMS = \ + test_buffer_view \ + test_condition \ + test_directory_handle \ + test_event_expr_to_bytecode \ + test_event_rule \ + test_fd_tracker \ + test_kernel_data \ + test_kernel_probe \ + 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_ust_data @@ -59,6 +77,7 @@ 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/shm.$(OBJEXT) \ @@ -110,7 +129,7 @@ RELAYD_OBJS = $(top_builddir)/src/bin/lttng-relayd/backward-compatibility-group- test_session_SOURCES = test_session.c test_session_LDADD = $(LIBTAP) $(LIBCOMMON) $(LIBRELAYD) $(LIBSESSIOND_COMM) \ - $(LIBHASHTABLE) $(DL_LIBS) -lrt -lurcu-common -lurcu \ + $(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 \ @@ -130,7 +149,7 @@ endif 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 \ + $(LIBHASHTABLE) $(DL_LIBS) -lrt $(URCU_LIBS) \ $(UST_CTL_LIBS) \ $(KMOD_LIBS) \ $(top_builddir)/src/lib/lttng-ctl/liblttng-ctl.la \ @@ -174,6 +193,11 @@ 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) +# compat_pthread unit test +test_utils_compat_pthread_SOURCES = test_utils_compat_pthread.c +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_LDADD = $(LIBTAP) $(LIBHASHTABLE) $(LIBCOMMON) $(DL_LIBS) @@ -189,6 +213,14 @@ 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) + +# Condition api +test_condition_SOURCES = test_condition.c +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 @@ -197,7 +229,7 @@ test_relayd_backward_compat_group_by_session_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_s # fd tracker unit test test_fd_tracker_SOURCES = test_fd_tracker.c -test_fd_tracker_LDADD = $(LIBTAP) $(LIBFDTRACKER) $(DL_LIBS) -lurcu $(LIBCOMMON) $(LIBHASHTABLE) +test_fd_tracker_LDADD = $(LIBTAP) $(LIBFDTRACKER) $(DL_LIBS) $(URCU_LIBS) $(LIBCOMMON) $(LIBHASHTABLE) # uuid unit test test_uuid_SOURCES = test_uuid.c @@ -214,3 +246,11 @@ test_payload_LDADD = $(LIBTAP) $(LIBSESSIOND_COMM) $(LIBCOMMON) # unix socket test test_unix_socket_SOURCES = test_unix_socket.c test_unix_socket_LDADD = $(LIBTAP) $(LIBSESSIOND_COMM) $(LIBCOMMON) + +# Kernel probe location api test +test_kernel_probe_SOURCES = test_kernel_probe.c +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_LDADD = $(LIBTAP) $(LIBLTTNG_CTL) $(LIBCOMMON)