X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Funit%2FMakefile.am;h=ee4a37b7f8510d66245072cb5fd717eb0adae5d6;hp=247178177c180a0c8dec7dff20356f0ce5006e99;hb=dcabc1905756b2999886313ec33705f7571a3fb9;hpb=0b2dc8df2a6d7b3341a72a04767dd6328907c97c diff --git a/tests/unit/Makefile.am b/tests/unit/Makefile.am index 247178177..ee4a37b7f 100644 --- a/tests/unit/Makefile.am +++ b/tests/unit/Makefile.am @@ -1,83 +1,125 @@ -AM_CFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src -I$(top_srcdir)/tests/utils/ -I$(srcdir) -AM_LDFLAGS = +SUBDIRS = ini_config -if LTTNG_TOOLS_BUILD_WITH_LIBDL -AM_LDFLAGS += -ldl -endif -if LTTNG_TOOLS_BUILD_WITH_LIBC_DL -AM_LDFLAGS += -lc -endif +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 + +TESTS = test_kernel_data \ + test_session \ + test_uri \ + test_utils_parse_size_suffix \ + test_utils_parse_time_suffix \ + test_utils_expand_path \ + test_string_utils \ + test_notification \ + ini_config/test_ini_config LIBTAP=$(top_builddir)/tests/utils/tap/libtap.la LIBCOMMON=$(top_builddir)/src/common/libcommon.la +LIBSTRINGUTILS=$(top_builddir)/src/common/string-utils/libstring-utils.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 # Define test programs -noinst_PROGRAMS = test_uri test_session test_kernel_data test_utils_parse_size_suffix +noinst_PROGRAMS = test_uri test_session test_kernel_data \ + test_utils_parse_size_suffix test_utils_parse_time_suffix \ + test_utils_expand_path test_string_utils test_notification if HAVE_LIBLTTNG_UST_CTL noinst_PROGRAMS += test_ust_data +TESTS += test_ust_data endif # URI unit tests test_uri_SOURCES = test_uri.c -test_uri_LDADD = $(LIBTAP) $(LIBCOMMON) $(LIBHASHTABLE) +test_uri_LDADD = $(LIBTAP) $(LIBCOMMON) $(LIBHASHTABLE) $(DL_LIBS) # Session unit test -SESSIONS=$(top_srcdir)/src/bin/lttng-sessiond/session.o \ - $(top_srcdir)/src/bin/lttng-sessiond/consumer.o \ - $(top_srcdir)/src/bin/lttng-sessiond/utils.o \ - $(top_srcdir)/src/bin/lttng-sessiond/health.o \ - $(top_srcdir)/src/common/uri.o \ - $(top_srcdir)/src/common/utils.o \ - $(top_srcdir)/src/common/error.o +SESSIONS=$(top_builddir)/src/bin/lttng-sessiond/session.$(OBJEXT) \ + $(top_builddir)/src/bin/lttng-sessiond/consumer.$(OBJEXT) \ + $(top_builddir)/src/bin/lttng-sessiond/utils.$(OBJEXT) \ + $(top_builddir)/src/bin/lttng-sessiond/snapshot.$(OBJEXT) \ + $(top_builddir)/src/bin/lttng-sessiond/ht-cleanup.$(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 + test_session_SOURCES = test_session.c -test_session_LDADD = $(LIBTAP) $(LIBCOMMON) $(LIBSESSIOND_COMM) $(LIBHASHTABLE) \ - -lrt +test_session_LDADD = $(LIBTAP) $(LIBCOMMON) $(LIBRELAYD) $(LIBSESSIOND_COMM) \ + $(LIBHASHTABLE) $(DL_LIBS) -lrt test_session_LDADD += $(SESSIONS) # UST data structures unit test if HAVE_LIBLTTNG_UST_CTL -UST_DATA_TRACE=$(top_srcdir)/src/bin/lttng-sessiond/trace-ust.o \ - $(top_srcdir)/src/bin/lttng-sessiond/consumer.o \ - $(top_srcdir)/src/bin/lttng-sessiond/utils.o \ - $(top_srcdir)/src/bin/lttng-sessiond/buffer-registry.o \ - $(top_srcdir)/src/bin/lttng-sessiond/ust-registry.o \ - $(top_srcdir)/src/bin/lttng-sessiond/ust-metadata.o \ - $(top_srcdir)/src/bin/lttng-sessiond/ust-app.o \ - $(top_srcdir)/src/bin/lttng-sessiond/ust-consumer.o \ - $(top_srcdir)/src/bin/lttng-sessiond/fd-limit.o \ - $(top_srcdir)/src/bin/lttng-sessiond/health.o \ - $(top_srcdir)/src/bin/lttng-sessiond/session.o \ - $(top_srcdir)/src/common/uri.o \ - $(top_srcdir)/src/common/utils.o +UST_DATA_TRACE=$(top_builddir)/src/bin/lttng-sessiond/trace-ust.$(OBJEXT) \ + $(top_builddir)/src/bin/lttng-sessiond/consumer.$(OBJEXT) \ + $(top_builddir)/src/bin/lttng-sessiond/utils.$(OBJEXT) \ + $(top_builddir)/src/bin/lttng-sessiond/buffer-registry.$(OBJEXT) \ + $(top_builddir)/src/bin/lttng-sessiond/ust-registry.$(OBJEXT) \ + $(top_builddir)/src/bin/lttng-sessiond/ust-field-utils.$(OBJEXT) \ + $(top_builddir)/src/bin/lttng-sessiond/ust-metadata.$(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/fd-limit.$(OBJEXT) \ + $(top_builddir)/src/bin/lttng-sessiond/session.$(OBJEXT) \ + $(top_builddir)/src/bin/lttng-sessiond/snapshot.$(OBJEXT) \ + $(top_builddir)/src/bin/lttng-sessiond/agent.$(OBJEXT) \ + $(top_builddir)/src/bin/lttng-sessiond/notification-thread-commands.$(OBJEXT) \ + $(top_builddir)/src/common/libcommon.la \ + $(top_builddir)/src/common/health/libhealth.la \ + $(top_builddir)/src/common/sessiond-comm/libsessiond-comm.la test_ust_data_SOURCES = test_ust_data.c -test_ust_data_LDADD = $(LIBTAP) $(LIBCOMMON) $(LIBSESSIOND_COMM) $(LIBHASHTABLE) \ - -lrt -llttng-ust-ctl +test_ust_data_LDADD = $(LIBTAP) $(LIBCOMMON) $(LIBRELAYD) $(LIBSESSIOND_COMM)\ + $(LIBHASHTABLE) $(DL_LIBS) -lrt -llttng-ust-ctl test_ust_data_LDADD += $(UST_DATA_TRACE) endif # Kernel data structures unit test -KERN_DATA_TRACE=$(top_srcdir)/src/bin/lttng-sessiond/trace-kernel.o \ - $(top_srcdir)/src/bin/lttng-sessiond/consumer.o \ - $(top_srcdir)/src/bin/lttng-sessiond/health.o \ - $(top_srcdir)/src/bin/lttng-sessiond/utils.o \ - $(top_srcdir)/src/common/uri.o \ - $(top_srcdir)/src/common/utils.o +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/utils.$(OBJEXT) \ + $(top_builddir)/src/common/libcommon.la \ + $(top_builddir)/src/common/health/libhealth.la \ + $(top_builddir)/src/bin/lttng-sessiond/notification-thread-commands.$(OBJEXT) \ + $(top_builddir)/src/common/sessiond-comm/libsessiond-comm.la \ + $(LIBLTTNG_CTL) test_kernel_data_SOURCES = test_kernel_data.c -test_kernel_data_LDADD = $(LIBTAP) $(LIBCOMMON) $(LIBSESSIOND_COMM) $(LIBHASHTABLE) \ - -lrt +test_kernel_data_LDADD = $(LIBTAP) $(LIBCOMMON) $(LIBRELAYD) $(LIBSESSIOND_COMM) \ + $(LIBHASHTABLE) $(DL_LIBS) -lrt test_kernel_data_LDADD += $(KERN_DATA_TRACE) -# parse_size_suffix unit test -UTILS_PARSE_SIZE_SUFFIX=$(top_srcdir)/src/common/utils.o \ - $(top_srcdir)/src/common/runas.o +# utils suffix for unit test +UTILS_SUFFIX=$(top_builddir)/src/common/libcommon.la +# 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) -test_utils_parse_size_suffix_LDADD += $(UTILS_PARSE_SIZE_SUFFIX) +test_utils_parse_size_suffix_LDADD = $(LIBTAP) $(LIBHASHTABLE) $(LIBCOMMON) $(DL_LIBS) +test_utils_parse_size_suffix_LDADD += $(UTILS_SUFFIX) + +# 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 += $(UTILS_SUFFIX) + +# 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 += $(UTILS_SUFFIX) + +# string utilities unit test +test_string_utils_SOURCES = test_string_utils.c +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)