X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Funit%2FMakefile.am;h=a38785a1e72014c5c7f39044d88f52831ccc0af0;hp=945dd001ecb7149021c1f5256b42e95c69f8afc6;hb=b55e7034ae4b3bf9fb7c88c9fd102896cf322efe;hpb=635eb1df606e714f3d5cdded93b9c663b0e8e4c3 diff --git a/tests/unit/Makefile.am b/tests/unit/Makefile.am index 945dd001e..a38785a1e 100644 --- a/tests/unit/Makefile.am +++ b/tests/unit/Makefile.am @@ -1,16 +1,31 @@ +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 \ + test_string_utils \ + 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 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 @@ -18,9 +33,11 @@ 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 +noinst_PROGRAMS += test_string_utils if HAVE_LIBLTTNG_UST_CTL noinst_PROGRAMS += test_ust_data +TESTS += test_ust_data endif # URI unit tests @@ -28,13 +45,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/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/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 @@ -46,20 +64,20 @@ 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/jul.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/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 @@ -70,12 +88,12 @@ 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 \ - $(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/bin/lttng-sessiond/notification-thread-commands.$(OBJEXT) \ $(top_builddir)/src/common/sessiond-comm/libsessiond-comm.la test_kernel_data_SOURCES = test_kernel_data.c @@ -84,8 +102,7 @@ test_kernel_data_LDADD = $(LIBTAP) $(LIBCOMMON) $(LIBRELAYD) $(LIBSESSIOND_COMM) test_kernel_data_LDADD += $(KERN_DATA_TRACE) # utils suffix for unit test -UTILS_SUFFIX=$(top_builddir)/src/common/.libs/utils.o \ - $(top_builddir)/src/common/.libs/runas.o +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 @@ -96,3 +113,7 @@ test_utils_parse_size_suffix_LDADD += $(UTILS_SUFFIX) 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) + +# string utilities unit test +test_string_utils_SOURCES = test_string_utils.c +test_string_utils_LDADD = $(LIBTAP) $(LIBCOMMON) $(LIBSTRINGUTILS)