X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Funit%2FMakefile.am;h=c8deb2ec337026b2dc2a5024479f023c68c26500;hp=10dbd3a608d3b68ecab77e808725ecda1b786b26;hb=7966af5763c4aaca39df9bbfa9277ff15715c720;hpb=9cff59ec0a1724d7b2a3f38dfa7838357e150dba diff --git a/tests/unit/Makefile.am b/tests/unit/Makefile.am index 10dbd3a60..c8deb2ec3 100644 --- a/tests/unit/Makefile.am +++ b/tests/unit/Makefile.am @@ -6,7 +6,7 @@ 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 = \ ini_config/test_ini_config \ @@ -16,7 +16,7 @@ TESTS = \ test_event_expr_to_bytecode \ test_event_rule \ test_fd_tracker \ - test_firing_policy \ + test_rate_policy \ test_kernel_data \ test_kernel_probe \ test_log_level_rule \ @@ -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 = \ @@ -53,7 +54,7 @@ noinst_PROGRAMS = \ test_event_expr_to_bytecode \ test_event_rule \ test_fd_tracker \ - test_firing_policy \ + test_rate_policy \ test_kernel_data \ test_kernel_probe \ test_log_level_rule \ @@ -80,109 +81,24 @@ endif test_uri_SOURCES = test_uri.c 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/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_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 @@ -234,9 +150,9 @@ test_relayd_backward_compat_group_by_session_SOURCES = test_relayd_backward_comp 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 -# firing policy object unit test -test_firing_policy_SOURCES = test_firing_policy.c -test_firing_policy_LDADD = $(LIBTAP) $(LIBCOMMON) $(LIBLTTNG_CTL) $(DL_LIBS) \ +# rate policy object unit test +test_rate_policy_SOURCES = test_rate_policy.c +test_rate_policy_LDADD = $(LIBTAP) $(LIBCOMMON) $(LIBLTTNG_CTL) $(DL_LIBS) \ $(top_builddir)/src/bin/lttng/lttng-loglevel.$(OBJEXT) # fd tracker unit test