From 83b45089a2624e885b0f0308be7ba5b061b23282 Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A9r=C3=A9mie=20Galarneau?= Date: Thu, 4 May 2017 23:53:27 -0400 Subject: [PATCH 1/1] Tests: add placeholder symbol to allow unit tests to link MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Jérémie Galarneau --- tests/unit/Makefile.am | 2 ++ tests/unit/test_kernel_data.c | 1 + tests/unit/test_ust_data.c | 4 +++- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/tests/unit/Makefile.am b/tests/unit/Makefile.am index f9dd53bef..f11b69b7c 100644 --- a/tests/unit/Makefile.am +++ b/tests/unit/Makefile.am @@ -73,6 +73,7 @@ UST_DATA_TRACE=$(top_builddir)/src/bin/lttng-sessiond/trace-ust.$(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 @@ -89,6 +90,7 @@ KERN_DATA_TRACE=$(top_builddir)/src/bin/lttng-sessiond/trace-kernel.$(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 diff --git a/tests/unit/test_kernel_data.c b/tests/unit/test_kernel_data.c index 6a35ea54a..ad4666b6f 100644 --- a/tests/unit/test_kernel_data.c +++ b/tests/unit/test_kernel_data.c @@ -38,6 +38,7 @@ int lttng_opt_quiet = 1; int lttng_opt_verbose; int lttng_opt_mi; +struct notification_thread_handle *notification_thread_handle; int ust_consumerd32_fd; int ust_consumerd64_fd; diff --git a/tests/unit/test_ust_data.c b/tests/unit/test_ust_data.c index 7996b8e60..86c1e23bf 100644 --- a/tests/unit/test_ust_data.c +++ b/tests/unit/test_ust_data.c @@ -30,6 +30,7 @@ #include #include #include +#include #include @@ -49,8 +50,9 @@ int lttng_opt_mi; int ust_consumerd32_fd; int ust_consumerd64_fd; -/* Global variable required by sessiond objects being linked-in */ +/* Global variables required by sessiond objects being linked-in */ struct lttng_ht *agent_apps_ht_by_sock; +struct notification_thread_handle *notification_thread_handle; static const char alphanum[] = "0123456789" -- 2.34.1