build: Use liblttng-sessiond-common.la instead of SESSIOND_OBJS

This allows correctly linking test_session and test_ust_data
with slibtool.

Signed-off-by: orbea <orbea@riseup.net>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Change-Id: I5c18187e4185218db337ac3548f0d44fb60501f3

diff --git a/tests/unit/Makefile.am b/tests/unit/Makefile.am
index b3bfffff33d3ec064dfba26c94a8b8cfb966a9a1..7ff30d2662b897571123b25795dde0470d453480 100644 (file)
--- a/tests/unit/Makefile.am
+++ b/tests/unit/Makefile.am
@@ -81,73 +81,10 @@ endif
 test_uri_SOURCES = test_uri.c
 test_uri_LDADD = $(LIBTAP) $(LIBCOMMON) $(LIBHASHTABLE) $(DL_LIBS)
 
-# Sessiond objects
-SESSIOND_OBJS = $(top_builddir)/src/bin/lttng-sessiond/buffer-registry.$(OBJEXT) \
-        $(top_builddir)/src/bin/lttng-sessiond/cmd.$(OBJEXT) \
-        $(top_builddir)/src/bin/lttng-sessiond/condition-internal.$(OBJEXT) \
-        $(top_builddir)/src/bin/lttng-sessiond/save.$(OBJEXT) \
-        $(top_builddir)/src/bin/lttng-sessiond/notification-thread-commands.$(OBJEXT) \
-        $(top_builddir)/src/bin/lttng-sessiond/kernel.$(OBJEXT) \
-        $(top_builddir)/src/bin/lttng-sessiond/ht-cleanup.$(OBJEXT) \
-        $(top_builddir)/src/bin/lttng-sessiond/notification-thread.$(OBJEXT) \
-        $(top_builddir)/src/bin/lttng-sessiond/action-executor.$(OBJEXT) \
-        $(top_builddir)/src/bin/lttng-sessiond/lttng-syscall.$(OBJEXT) \
-        $(top_builddir)/src/bin/lttng-sessiond/channel.$(OBJEXT) \
-        $(top_builddir)/src/bin/lttng-sessiond/agent.$(OBJEXT) \
-        $(top_builddir)/src/bin/lttng-sessiond/kernel-consumer.$(OBJEXT) \
-        $(top_builddir)/src/bin/lttng-sessiond/trace-kernel.$(OBJEXT) \
-        $(top_builddir)/src/bin/lttng-sessiond/rotation-thread.$(OBJEXT) \
-        $(top_builddir)/src/bin/lttng-sessiond/context.$(OBJEXT) \
-        $(top_builddir)/src/bin/lttng-sessiond/consumer.$(OBJEXT) \
-        $(top_builddir)/src/bin/lttng-sessiond/utils.$(OBJEXT) \
-        $(top_builddir)/src/bin/lttng-sessiond/fd-limit.$(OBJEXT) \
-        $(top_builddir)/src/bin/lttng-sessiond/notification-thread-events.$(OBJEXT) \
-        $(top_builddir)/src/bin/lttng-sessiond/event.$(OBJEXT) \
-        $(top_builddir)/src/bin/lttng-sessiond/event-notifier-error-accounting.$(OBJEXT) \
-        $(top_builddir)/src/bin/lttng-sessiond/timer.$(OBJEXT) \
-        $(top_builddir)/src/bin/lttng-sessiond/snapshot.$(OBJEXT) \
-        $(top_builddir)/src/bin/lttng-sessiond/sessiond-config.$(OBJEXT) \
-        $(top_builddir)/src/bin/lttng-sessiond/rotate.$(OBJEXT) \
-        $(top_builddir)/src/bin/lttng-sessiond/modprobe.$(OBJEXT) \
-        $(top_builddir)/src/bin/lttng-sessiond/session.$(OBJEXT) \
-        $(top_builddir)/src/bin/lttng-sessiond/globals.$(OBJEXT) \
-        $(top_builddir)/src/bin/lttng-sessiond/thread-utils.$(OBJEXT) \
-        $(top_builddir)/src/bin/lttng-sessiond/process-utils.$(OBJEXT) \
-        $(top_builddir)/src/bin/lttng-sessiond/thread.$(OBJEXT) \
-        $(top_builddir)/src/bin/lttng-sessiond/tracker.$(OBJEXT) \
-        $(top_builddir)/src/bin/lttng-sessiond/trigger-error-query.$(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
-
-if HAVE_LIBLTTNG_UST_CTL
-SESSIOND_OBJS += $(top_builddir)/src/bin/lttng-sessiond/trace-ust.$(OBJEXT) \
-                $(top_builddir)/src/bin/lttng-sessiond/ust-registry.$(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/notify-apps.$(OBJEXT) \
-                $(top_builddir)/src/bin/lttng-sessiond/ust-metadata.$(OBJEXT) \
-                $(top_builddir)/src/bin/lttng-sessiond/agent-thread.$(OBJEXT) \
-                $(top_builddir)/src/bin/lttng-sessiond/ust-field-utils.$(OBJEXT)
-endif
-
 RELAYD_OBJS = $(top_builddir)/src/bin/lttng-relayd/backward-compatibility-group-by.$(OBJEXT)
 
 test_session_SOURCES = test_session.c
-test_session_LDADD = $(LIBTAP) $(LIBCOMMON) $(LIBRELAYD) $(LIBSESSIOND_COMM) \
-                    $(LIBHASHTABLE) $(DL_LIBS) -lrt $(URCU_LIBS) \
-                    $(KMOD_LIBS) \
-                    $(top_builddir)/src/lib/lttng-ctl/liblttng-ctl.la \
-                    $(top_builddir)/src/common/kernel-ctl/libkernel-ctl.la \
-                    $(top_builddir)/src/common/compat/libcompat.la \
-                    $(top_builddir)/src/common/testpoint/libtestpoint.la \
-                    $(top_builddir)/src/common/health/libhealth.la \
-                    $(top_builddir)/src/common/config/libconfig.la \
-                    $(top_builddir)/src/common/string-utils/libstring-utils.la
-
-test_session_LDADD += $(SESSIOND_OBJS)
+test_session_LDADD = $(LIBTAP) $(LIBLTTNG_SESSIOND_COMMON) $(DL_LIBS)
 
 if HAVE_LIBLTTNG_UST_CTL
 test_session_SOURCES += ust-sigbus.c
@@ -157,18 +94,7 @@ endif
 # UST data structures unit test
 if HAVE_LIBLTTNG_UST_CTL
 test_ust_data_SOURCES = test_ust_data.c
-test_ust_data_LDADD = $(LIBTAP) $(LIBCOMMON) $(LIBRELAYD) $(LIBSESSIOND_COMM) \
-                     $(LIBHASHTABLE) $(DL_LIBS) -lrt $(URCU_LIBS) \
-                     $(UST_CTL_LIBS) \
-                     $(KMOD_LIBS) \
-                     $(top_builddir)/src/lib/lttng-ctl/liblttng-ctl.la \
-                     $(top_builddir)/src/common/kernel-ctl/libkernel-ctl.la \
-                     $(top_builddir)/src/common/compat/libcompat.la \
-                     $(top_builddir)/src/common/testpoint/libtestpoint.la \
-                     $(top_builddir)/src/common/health/libhealth.la \
-                     $(top_builddir)/src/common/config/libconfig.la \
-                     $(top_builddir)/src/common/string-utils/libstring-utils.la
-test_ust_data_LDADD += $(SESSIOND_OBJS)
+test_ust_data_LDADD = $(LIBTAP) $(LIBLTTNG_SESSIOND_COMMON) $(DL_LIBS)
 endif
 
 test_kernel_data_SOURCES = test_kernel_data.c

diff --git a/tests/unit/test_session.c b/tests/unit/test_session.c
index e6d9ec8bcc57c2967936dadd7dfa2489527e034f..675f710ae3eeba6204422790a21c9c5bff9086ef 100644 (file)
--- a/tests/unit/test_session.c
+++ b/tests/unit/test_session.c
@@ -35,11 +35,6 @@
 
 static struct ltt_session_list *session_list;
 
-/* For error.h */
-int lttng_opt_quiet = 1;
-int lttng_opt_verbose = 0;
-int lttng_opt_mi;
-
 static const char alphanum[] =
        "0123456789"
        "ABCDEFGHIJKLMNOPQRSTUVWXYZ"

diff --git a/tests/unit/test_ust_data.c b/tests/unit/test_ust_data.c
index 87da5b4b6953a7a935b2e01016366b80fa8ab4a0..1fc74fc33289d2776c9b07982bf86f1851f286a4 100644 (file)
--- a/tests/unit/test_ust_data.c
+++ b/tests/unit/test_ust_data.c
@@ -35,11 +35,6 @@
 
 DEFINE_LTTNG_UST_SIGBUS_STATE();
 
-/* For error.h */
-int lttng_opt_quiet = 1;
-int lttng_opt_verbose;
-int lttng_opt_mi;
-
 static const char alphanum[] =
        "0123456789"
        "ABCDEFGHIJKLMNOPQRSTUVWXYZ"