X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Funit%2FMakefile.am;h=1ff6ab1d03aaaf7dd97999322de55fa4e4ff3a77;hp=b6981075dcd2b759dea358c7e85bed8b51a14222;hb=7010c0332387eea98b52f301458d481f151840a6;hpb=9354f1d04c5e433da72d0b466f661e30e548097c diff --git a/tests/unit/Makefile.am b/tests/unit/Makefile.am index b6981075d..1ff6ab1d0 100644 --- a/tests/unit/Makefile.am +++ b/tests/unit/Makefile.am @@ -1,7 +1,6 @@ SUBDIRS = ini_config -AM_CFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src -I$(top_srcdir)/tests/utils/ -I$(srcdir) -AM_LDFLAGS = +AM_CPPFLAGS += -I$(top_srcdir)/tests/utils/ -I$(srcdir) LOG_DRIVER_FLAGS='--merge' LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) \ @@ -11,26 +10,25 @@ 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 -if LTTNG_TOOLS_BUILD_WITH_LIBDL -LIBS += -ldl -endif -if LTTNG_TOOLS_BUILD_WITH_LIBC_DL -LIBS += -lc -endif - 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 -noinst_PROGRAMS += test_utils_parse_size_suffix test_utils_expand_path +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 @@ -39,58 +37,63 @@ 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_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/snapshot.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) $(LIBRELAYD) $(LIBSESSIOND_COMM) \ - $(LIBHASHTABLE) -lrt + $(LIBHASHTABLE) $(DL_LIBS) -lrt 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/session.o \ - $(top_builddir)/src/bin/lttng-sessiond/snapshot.o \ - $(top_builddir)/src/bin/lttng-sessiond/agent.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/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 + $(LIBHASHTABLE) $(DL_LIBS) -lrt -llttng-ust-ctl 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/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 test_kernel_data_SOURCES = test_kernel_data.c test_kernel_data_LDADD = $(LIBTAP) $(LIBCOMMON) $(LIBRELAYD) $(LIBSESSIOND_COMM) \ - $(LIBHASHTABLE) -lrt + $(LIBHASHTABLE) $(DL_LIBS) -lrt test_kernel_data_LDADD += $(KERN_DATA_TRACE) # utils suffix for unit test @@ -98,10 +101,23 @@ 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 = $(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) +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)