X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Funit%2FMakefile.am;h=f11b69b7c29b83c2e736410f1b95f5c1c607eba0;hp=c9e1bfcf44d2cd99ca0ce4505993f501e7ad45a6;hb=83b45089a2624e885b0f0308be7ba5b061b23282;hpb=fe4477ee14abb348ce9e167f8b4c09312d67de36 diff --git a/tests/unit/Makefile.am b/tests/unit/Makefile.am index c9e1bfcf4..f11b69b7c 100644 --- a/tests/unit/Makefile.am +++ b/tests/unit/Makefile.am @@ -1,11 +1,24 @@ +SUBDIRS = ini_config + AM_CFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src -I$(top_srcdir)/tests/utils/ -I$(srcdir) AM_LDFLAGS = +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_expand_path \ + ini_config/test_ini_config + if LTTNG_TOOLS_BUILD_WITH_LIBDL -AM_LDFLAGS += -ldl +LIBS += -ldl endif if LTTNG_TOOLS_BUILD_WITH_LIBC_DL -AM_LDFLAGS += -lc +LIBS += -lc endif LIBTAP=$(top_builddir)/tests/utils/tap/libtap.la @@ -13,11 +26,15 @@ 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 +LIBRELAYD=$(top_builddir)/src/common/relayd/librelayd.la + +# Define test programs +noinst_PROGRAMS = test_uri test_session test_kernel_data +noinst_PROGRAMS += test_utils_parse_size_suffix test_utils_expand_path 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 @@ -25,44 +42,71 @@ test_uri_SOURCES = test_uri.c test_uri_LDADD = $(LIBTAP) $(LIBCOMMON) $(LIBHASHTABLE) # Session unit test -SESSIONS=$(top_srcdir)/src/bin/lttng-sessiond/session.c \ - $(top_srcdir)/src/bin/lttng-sessiond/consumer.c \ - $(top_srcdir)/src/bin/lttng-sessiond/health.c \ - $(top_srcdir)/src/common/uri.c \ - $(top_srcdir)/src/common/utils.c \ - $(top_srcdir)/src/common/error.c +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 $(SESSIONS) -test_session_LDADD = $(LIBTAP) $(LIBCOMMON) $(LIBSESSIOND_COMM) $(LIBHASHTABLE) \ - -lrt +test_session_SOURCES = test_session.c +test_session_LDADD = $(LIBTAP) $(LIBCOMMON) $(LIBRELAYD) $(LIBSESSIOND_COMM) \ + $(LIBHASHTABLE) -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.c \ - $(top_srcdir)/src/bin/lttng-sessiond/consumer.c \ - $(top_srcdir)/src/bin/lttng-sessiond/buffer-registry.c \ - $(top_srcdir)/src/bin/lttng-sessiond/ust-registry.c \ - $(top_srcdir)/src/bin/lttng-sessiond/ust-metadata.c \ - $(top_srcdir)/src/bin/lttng-sessiond/ust-app.c \ - $(top_srcdir)/src/bin/lttng-sessiond/ust-consumer.c \ - $(top_srcdir)/src/bin/lttng-sessiond/fd-limit.c \ - $(top_srcdir)/src/bin/lttng-sessiond/health.c \ - $(top_srcdir)/src/bin/lttng-sessiond/session.c \ - $(top_srcdir)/src/common/uri.c \ - $(top_srcdir)/src/common/utils.c - -test_ust_data_SOURCES = test_ust_data.c $(UST_DATA_TRACE) -test_ust_data_LDADD = $(LIBTAP) $(LIBCOMMON) $(LIBSESSIOND_COMM) $(LIBHASHTABLE) \ - -lrt -llttng-ust-ctl +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-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) $(LIBRELAYD) $(LIBSESSIOND_COMM)\ + $(LIBHASHTABLE) -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.c \ - $(top_srcdir)/src/bin/lttng-sessiond/consumer.c \ - $(top_srcdir)/src/bin/lttng-sessiond/health.c \ - $(top_srcdir)/src/common/uri.c \ - $(top_srcdir)/src/common/utils.c - -test_kernel_data_SOURCES = test_kernel_data.c $(KERN_DATA_TRACE) -test_kernel_data_LDADD = $(LIBTAP) $(LIBCOMMON) $(LIBSESSIOND_COMM) $(LIBHASHTABLE) \ - -lrt +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 + +test_kernel_data_SOURCES = test_kernel_data.c +test_kernel_data_LDADD = $(LIBTAP) $(LIBCOMMON) $(LIBRELAYD) $(LIBSESSIOND_COMM) \ + $(LIBHASHTABLE) -lrt +test_kernel_data_LDADD += $(KERN_DATA_TRACE) + +# 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_SUFFIX) + +# expand_path unit test +test_utils_expand_path_SOURCES = test_utils_expand_path.c +test_utils_expand_path_LDADD = $(LIBTAP) $(LIBHASHTABLE) $(LIBCOMMON) +test_utils_expand_path_LDADD += $(UTILS_SUFFIX)