Fix: merge tap tests stdout and stderr

[lttng-tools.git] / tests / unit / Makefile.am

diff --git a/tests/unit/Makefile.am b/tests/unit/Makefile.am
index ec8d22f620638f8580f60af1b99e48a6845f47a5..5625cf0fcba42387266e90d05b4a98e5d5169f62 100644 (file)
--- a/tests/unit/Makefile.am
+++ b/tests/unit/Makefile.am
@@ -3,11 +3,22 @@ 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
@@ -23,6 +34,7 @@ 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
@@ -34,9 +46,9 @@ 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 \
+        $(top_builddir)/src/common/uri.o \
+        $(top_builddir)/src/common/utils.o \
+        $(top_builddir)/src/common/error.o \
         $(top_builddir)/src/common/health/libhealth.la \
         $(top_builddir)/src/common/sessiond-comm/libsessiond-comm.la
 
@@ -59,9 +71,9 @@ UST_DATA_TRACE=$(top_builddir)/src/bin/lttng-sessiond/trace-ust.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 \
+                  $(top_builddir)/src/bin/lttng-sessiond/agent.o \
+                  $(top_builddir)/src/common/uri.o \
+                  $(top_builddir)/src/common/utils.o \
                   $(top_builddir)/src/common/health/libhealth.la \
                   $(top_builddir)/src/common/sessiond-comm/libsessiond-comm.la
 
@@ -75,8 +87,8 @@ endif
 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 \
+               $(top_builddir)/src/common/uri.o \
+               $(top_builddir)/src/common/utils.o \
                $(top_builddir)/src/common/health/libhealth.la \
                $(top_builddir)/src/common/sessiond-comm/libsessiond-comm.la
 
@@ -86,8 +98,8 @@ 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/utils.o \
+               $(top_builddir)/src/common/runas.o
 
 # parse_size_suffix unit test
 test_utils_parse_size_suffix_SOURCES = test_utils_parse_size_suffix.c