Fix: do not refer to objects as .o

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

diff --git a/tests/unit/Makefile.am b/tests/unit/Makefile.am
index b7f318fccc19f62093ad82ec7a8bf3144546eef2..3355e59b34b7025ba39dc3c1976926ed7f455653 100644 (file)
--- a/tests/unit/Makefile.am
+++ b/tests/unit/Makefile.am
@@ -3,6 +3,7 @@ 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
 
@@ -41,13 +42,11 @@ 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/uri.o \
-        $(top_builddir)/src/common/utils.o \
-        $(top_builddir)/src/common/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
 
@@ -59,20 +58,19 @@ 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 \
-                  $(top_builddir)/src/common/uri.o \
-                  $(top_builddir)/src/common/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
 
@@ -83,11 +81,10 @@ 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/uri.o \
-               $(top_builddir)/src/common/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
 
@@ -97,8 +94,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/utils.o \
-               $(top_builddir)/src/common/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