X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Funit%2FMakefile.am;h=3355e59b34b7025ba39dc3c1976926ed7f455653;hp=83bb8d3515355ec5be531ea264bc757b09014867;hb=827b3af01adcd2955f5a46044156a527a906d777;hpb=d3e2ba59faddb31870e2ce29b6a881f7ad5ad883 diff --git a/tests/unit/Makefile.am b/tests/unit/Makefile.am index 83bb8d351..3355e59b3 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 @@ -16,10 +29,12 @@ 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 test_utils_parse_size_suffix +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_ust_data +TESTS += test_ust_data endif # URI unit tests @@ -27,14 +42,14 @@ test_uri_SOURCES = test_uri.c test_uri_LDADD = $(LIBTAP) $(LIBCOMMON) $(LIBHASHTABLE) # Session unit test -SESSIONS=$(top_builddir)/src/bin/lttng-sessiond/session.o \ - $(top_builddir)/src/bin/lttng-sessiond/consumer.o \ - $(top_builddir)/src/bin/lttng-sessiond/utils.o \ - $(top_builddir)/src/bin/lttng-sessiond/health.o \ - $(top_builddir)/src/bin/lttng-sessiond/snapshot.o \ - $(top_builddir)/src/common/.libs/uri.o \ - $(top_builddir)/src/common/.libs/utils.o \ - $(top_builddir)/src/common/.libs/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/common/libcommon.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) $(LIBRELAYD) $(LIBSESSIOND_COMM) \ @@ -43,20 +58,21 @@ test_session_LDADD += $(SESSIONS) # UST data structures unit test if HAVE_LIBLTTNG_UST_CTL -UST_DATA_TRACE=$(top_builddir)/src/bin/lttng-sessiond/trace-ust.o \ - $(top_builddir)/src/bin/lttng-sessiond/consumer.o \ - $(top_builddir)/src/bin/lttng-sessiond/utils.o \ - $(top_builddir)/src/bin/lttng-sessiond/buffer-registry.o \ - $(top_builddir)/src/bin/lttng-sessiond/ust-registry.o \ - $(top_builddir)/src/bin/lttng-sessiond/ust-metadata.o \ - $(top_builddir)/src/bin/lttng-sessiond/ust-app.o \ - $(top_builddir)/src/bin/lttng-sessiond/ust-consumer.o \ - $(top_builddir)/src/bin/lttng-sessiond/fd-limit.o \ - $(top_builddir)/src/bin/lttng-sessiond/health.o \ - $(top_builddir)/src/bin/lttng-sessiond/session.o \ - $(top_builddir)/src/bin/lttng-sessiond/snapshot.o \ - $(top_builddir)/src/common/.libs/uri.o \ - $(top_builddir)/src/common/.libs/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-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/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)\ @@ -65,22 +81,27 @@ test_ust_data_LDADD += $(UST_DATA_TRACE) endif # Kernel data structures unit test -KERN_DATA_TRACE=$(top_builddir)/src/bin/lttng-sessiond/trace-kernel.o \ - $(top_builddir)/src/bin/lttng-sessiond/consumer.o \ - $(top_builddir)/src/bin/lttng-sessiond/health.o \ - $(top_builddir)/src/bin/lttng-sessiond/utils.o \ - $(top_builddir)/src/common/.libs/uri.o \ - $(top_builddir)/src/common/.libs/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/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) -# parse_size_suffix unit test -UTILS_PARSE_SIZE_SUFFIX=$(top_builddir)/src/common/.libs/utils.o \ - $(top_builddir)/src/common/.libs/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 += $(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)