From 7ccba6cb4d96e233ad7fa3cd412a44829781dd17 Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Tue, 5 Oct 2021 13:49:09 -0400 Subject: [PATCH] cleanup: remove urcu_bp dependency from ust tests MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit lttng-ust >= 2.13 has its own internal copy of urcu and doesn't require applications to link with urcu_bp anymore. Change-Id: I0a11af7cf284952dbc26d0657eb490040acb7438 Signed-off-by: Michael Jeanson Signed-off-by: Jérémie Galarneau --- configure.ac | 1 - tests/regression/ust/multi-session/Makefile.am | 2 +- tests/utils/testapp/gen-ust-events/Makefile.am | 2 +- tests/utils/testapp/gen-ust-nevents-str/Makefile.am | 2 +- tests/utils/testapp/gen-ust-nevents/Makefile.am | 2 +- 5 files changed, 4 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac index c8324a591..496c55ad1 100644 --- a/configure.ac +++ b/configure.ac @@ -488,7 +488,6 @@ AC_CHECK_FUNC([clock_gettime], [AC_DEFINE_UNQUOTED([LTTNG_HAVE_CLOCK_GETTIME], 1 # URCU library version needed or newer PKG_CHECK_MODULES([URCU], [liburcu >= 0.11]) -PKG_CHECK_MODULES([URCU_BP], [liburcu-bp >= 0.11]) PKG_CHECK_MODULES([URCU_CDS], [liburcu-cds >= 0.11]) AM_CPPFLAGS="$AM_CPPFLAGS $URCU_CFLAGS" diff --git a/tests/regression/ust/multi-session/Makefile.am b/tests/regression/ust/multi-session/Makefile.am index c50233fa8..5f83c5133 100644 --- a/tests/regression/ust/multi-session/Makefile.am +++ b/tests/regression/ust/multi-session/Makefile.am @@ -4,7 +4,7 @@ AM_CFLAGS += -I$(srcdir) noinst_PROGRAMS = gen-nevents gen_nevents_SOURCES = gen-nevents.c tp.c ust_gen_nevents.h -gen_nevents_LDADD = $(UST_LIBS) $(URCU_BP_LIBS) $(DL_LIBS) +gen_nevents_LDADD = $(UST_LIBS) $(DL_LIBS) noinst_SCRIPTS = test_multi_session EXTRA_DIST = test_multi_session diff --git a/tests/utils/testapp/gen-ust-events/Makefile.am b/tests/utils/testapp/gen-ust-events/Makefile.am index 4b1c2173b..f377de58b 100644 --- a/tests/utils/testapp/gen-ust-events/Makefile.am +++ b/tests/utils/testapp/gen-ust-events/Makefile.am @@ -6,7 +6,7 @@ AM_CPPFLAGS += -I$(top_srcdir)/tests/utils -I$(srcdir) \ if HAVE_LIBLTTNG_UST_CTL noinst_PROGRAMS = gen-ust-events gen_ust_events_SOURCES = gen-ust-events.c tp.c tp.h -gen_ust_events_LDADD = $(UST_LIBS) $(URCU_BP_LIBS) \ +gen_ust_events_LDADD = $(UST_LIBS) \ $(top_builddir)/tests/utils/libtestutils.la \ $(DL_LIBS) endif diff --git a/tests/utils/testapp/gen-ust-nevents-str/Makefile.am b/tests/utils/testapp/gen-ust-nevents-str/Makefile.am index 84198bedd..7330f1fb9 100644 --- a/tests/utils/testapp/gen-ust-nevents-str/Makefile.am +++ b/tests/utils/testapp/gen-ust-nevents-str/Makefile.am @@ -6,7 +6,7 @@ AM_CPPFLAGS += -I$(srcdir) -I$(top_srcdir)/tests/utils \ if HAVE_LIBLTTNG_UST_CTL noinst_PROGRAMS = gen-ust-nevents-str gen_ust_nevents_str_SOURCES = gen-ust-nevents-str.c tp.c tp.h -gen_ust_nevents_str_LDADD = $(UST_LIBS) $(URCU_BP_LIBS) \ +gen_ust_nevents_str_LDADD = $(UST_LIBS) \ $(top_builddir)/tests/utils/libtestutils.la \ $(DL_LIBS) endif diff --git a/tests/utils/testapp/gen-ust-nevents/Makefile.am b/tests/utils/testapp/gen-ust-nevents/Makefile.am index 6788b1f36..0ddbd9d39 100644 --- a/tests/utils/testapp/gen-ust-nevents/Makefile.am +++ b/tests/utils/testapp/gen-ust-nevents/Makefile.am @@ -6,7 +6,7 @@ AM_CPPFLAGS += -I$(srcdir) -I$(top_srcdir)/tests/utils \ if HAVE_LIBLTTNG_UST_CTL noinst_PROGRAMS = gen-ust-nevents gen_ust_nevents_SOURCES = gen-ust-nevents.c tp.c tp.h -gen_ust_nevents_LDADD = $(UST_LIBS) $(URCU_BP_LIBS) \ +gen_ust_nevents_LDADD = $(UST_LIBS) \ $(top_builddir)/tests/utils/libtestutils.la \ $(DL_LIBS) endif -- 2.34.1