build: Add the liblttng-sessiond-comm.la convenience library

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

diff --git a/tests/unit/Makefile.am b/tests/unit/Makefile.am
index ff49a56e4806c6ec16697df312e56703e0cd5f90..b3bfffff33d3ec064dfba26c94a8b8cfb966a9a1 100644 (file)
--- a/tests/unit/Makefile.am
+++ b/tests/unit/Makefile.am
@@ -6,7 +6,7 @@ AM_CPPFLAGS += -I$(top_srcdir)/tests/utils/ -I$(srcdir)
 
 LOG_DRIVER_FLAGS='--merge'
 LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) \
-       $(top_srcdir)/config/tap-driver.sh
+       $(top_srcdir)/tests/utils/tap-driver.sh
 
 TESTS = \
        ini_config/test_ini_config \
@@ -43,6 +43,7 @@ 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
+LIBLTTNG_SESSIOND_COMMON=$(top_builddir)/src/bin/lttng-sessiond/liblttng-sessiond-common.la
 
 # Define test programs
 noinst_PROGRAMS = \
@@ -170,21 +171,8 @@ test_ust_data_LDADD = $(LIBTAP) $(LIBCOMMON) $(LIBRELAYD) $(LIBSESSIOND_COMM) \
 test_ust_data_LDADD += $(SESSIOND_OBJS)
 endif
 
-# Kernel data structures unit test
-KERN_DATA_TRACE=$(top_builddir)/src/bin/lttng-sessiond/trace-kernel.$(OBJEXT) \
-               $(top_builddir)/src/common/compat/libcompat.la \
-               $(top_builddir)/src/bin/lttng-sessiond/consumer.$(OBJEXT) \
-               $(top_builddir)/src/bin/lttng-sessiond/globals.$(OBJEXT) \
-               $(top_builddir)/src/bin/lttng-sessiond/utils.$(OBJEXT) \
-               $(top_builddir)/src/bin/lttng-sessiond/tracker.$(OBJEXT) \
-               $(top_builddir)/src/common/health/libhealth.la \
-               $(top_builddir)/src/bin/lttng-sessiond/notification-thread-commands.$(OBJEXT) \
-               $(LIBLTTNG_CTL)
-
 test_kernel_data_SOURCES = test_kernel_data.c
-test_kernel_data_LDADD = $(LIBTAP) $(LIBCOMMON) $(LIBRELAYD) $(LIBSESSIOND_COMM) \
-                        $(LIBHASHTABLE) $(DL_LIBS) -lrt
-test_kernel_data_LDADD += $(KERN_DATA_TRACE)
+test_kernel_data_LDADD = $(LIBTAP) $(LIBLTTNG_SESSIOND_COMMON) $(DL_LIBS)
 
 # utils suffix for unit test