From 9aa8c9b2cbd05dbf47d4081f073e868b428e27fc Mon Sep 17 00:00:00 2001
From: Michael Jeanson <mjeanson@efficios.com>
Date: Tue, 8 Jun 2021 10:55:19 -0400
Subject: [PATCH] Build fix: build without lttng-ust
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Add conditionnal inclusion of ust-sigbus to the tests modified by:

  commit e207fe73b58787c6077ec5d49254e12ff1a82b51
  Author: orbea <orbea@riseup.net>
  Date:   Sat May 29 11:07:41 2021 -0700

    build: Add missing DEFINE_LTTNG_UST_SIGBUS_STATE();

    Fixes:

      liblttng-ust-ctl.so: undefined reference to `lttng_ust_sigbus_state'

Change-Id: If4af7ada6d94ee67603156d151575dcc57baad05
Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
---
 tests/regression/tools/live/live_test.c | 4 +++-
 tests/unit/test_kernel_data.c           | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/tests/regression/tools/live/live_test.c b/tests/regression/tools/live/live_test.c
index a9adc5946..3814c0568 100644
--- a/tests/regression/tools/live/live_test.c
+++ b/tests/regression/tools/live/live_test.c
@@ -23,7 +23,6 @@
 
 #include <tap/tap.h>
 #include <lttng/lttng.h>
-#include <lttng/ust-sigbus.h>
 
 #include <urcu/list.h>
 #include <common/common.h>
@@ -42,7 +41,10 @@
 #define NUM_TESTS 11
 #define mmap_size 524288
 
+#ifdef HAVE_LIBLTTNG_UST_CTL
+#include <lttng/ust-sigbus.h>
 DEFINE_LTTNG_UST_SIGBUS_STATE();
+#endif
 
 static int control_sock;
 struct live_session *session;
diff --git a/tests/unit/test_kernel_data.c b/tests/unit/test_kernel_data.c
index 58e701442..21ec911f2 100644
--- a/tests/unit/test_kernel_data.c
+++ b/tests/unit/test_kernel_data.c
@@ -15,7 +15,6 @@
 #include <common/compat/errno.h>
 #include <bin/lttng-sessiond/trace-kernel.h>
 #include <common/defaults.h>
-#include <lttng/ust-sigbus.h>
 
 #include <tap/tap.h>
 
@@ -24,7 +23,10 @@
 /* Number of TAP tests in this file */
 #define NUM_TESTS 11
 
+#ifdef HAVE_LIBLTTNG_UST_CTL
+#include <lttng/ust-sigbus.h>
 DEFINE_LTTNG_UST_SIGBUS_STATE();
+#endif
 
 static const char alphanum[] =
 	"0123456789"
-- 
2.34.1