* [PATCH lttng-tools] fix: Re-add link to urcu-bp for _LGPL_SOURCE tests
@ 2019-11-05 16:30 Michael Jeanson
0 siblings, 0 replies; 2+ messages in thread
From: Michael Jeanson @ 2019-11-05 16:30 UTC (permalink / raw)
To: lttng-dev; +Cc: jgalar
Tests with tracepoints defined with _LGPL_SOURCE require to be
explicitly linked against urcu-bp.
Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
---
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 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/tests/regression/ust/multi-session/Makefile.am b/tests/regression/ust/multi-session/Makefile.am
index 0d807a878..676c26f21 100644
--- a/tests/regression/ust/multi-session/Makefile.am
+++ b/tests/regression/ust/multi-session/Makefile.am
@@ -2,7 +2,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) $(DL_LIBS)
+gen_nevents_LDADD = $(UST_LIBS) -lurcu-bp $(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 38e620d75..8918fc80d 100644
--- a/tests/utils/testapp/gen-ust-events/Makefile.am
+++ b/tests/utils/testapp/gen-ust-events/Makefile.am
@@ -4,7 +4,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) \
+gen_ust_events_LDADD = $(UST_LIBS) -lurcu-bp \
$(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 0e961b4c4..27cb9efa7 100644
--- a/tests/utils/testapp/gen-ust-nevents-str/Makefile.am
+++ b/tests/utils/testapp/gen-ust-nevents-str/Makefile.am
@@ -4,7 +4,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) \
+gen_ust_nevents_str_LDADD = $(UST_LIBS) -lurcu-bp \
$(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 c20910bd8..f85d35a13 100644
--- a/tests/utils/testapp/gen-ust-nevents/Makefile.am
+++ b/tests/utils/testapp/gen-ust-nevents/Makefile.am
@@ -4,7 +4,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) \
+gen_ust_nevents_LDADD = $(UST_LIBS) -lurcu-bp \
$(top_builddir)/tests/utils/libtestutils.la \
$(DL_LIBS)
endif
--
2.17.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
[parent not found: <20191105163024.5085-1-mjeanson@efficios.com>]
* Re: [PATCH lttng-tools] fix: Re-add link to urcu-bp for _LGPL_SOURCE tests
[not found] <20191105163024.5085-1-mjeanson@efficios.com>
@ 2019-11-05 18:11 ` Jérémie Galarneau
0 siblings, 0 replies; 2+ messages in thread
From: Jérémie Galarneau @ 2019-11-05 18:11 UTC (permalink / raw)
To: Michael Jeanson; +Cc: lttng-dev, jgalar
Merged in master.
Thanks!
Jérémie
On Tue, Nov 05, 2019 at 11:30:24AM -0500, Michael Jeanson wrote:
> Tests with tracepoints defined with _LGPL_SOURCE require to be
> explicitly linked against urcu-bp.
>
> Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
> ---
> 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 +-
> 4 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/tests/regression/ust/multi-session/Makefile.am b/tests/regression/ust/multi-session/Makefile.am
> index 0d807a878..676c26f21 100644
> --- a/tests/regression/ust/multi-session/Makefile.am
> +++ b/tests/regression/ust/multi-session/Makefile.am
> @@ -2,7 +2,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) $(DL_LIBS)
> +gen_nevents_LDADD = $(UST_LIBS) -lurcu-bp $(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 38e620d75..8918fc80d 100644
> --- a/tests/utils/testapp/gen-ust-events/Makefile.am
> +++ b/tests/utils/testapp/gen-ust-events/Makefile.am
> @@ -4,7 +4,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) \
> +gen_ust_events_LDADD = $(UST_LIBS) -lurcu-bp \
> $(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 0e961b4c4..27cb9efa7 100644
> --- a/tests/utils/testapp/gen-ust-nevents-str/Makefile.am
> +++ b/tests/utils/testapp/gen-ust-nevents-str/Makefile.am
> @@ -4,7 +4,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) \
> +gen_ust_nevents_str_LDADD = $(UST_LIBS) -lurcu-bp \
> $(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 c20910bd8..f85d35a13 100644
> --- a/tests/utils/testapp/gen-ust-nevents/Makefile.am
> +++ b/tests/utils/testapp/gen-ust-nevents/Makefile.am
> @@ -4,7 +4,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) \
> +gen_ust_nevents_LDADD = $(UST_LIBS) -lurcu-bp \
> $(top_builddir)/tests/utils/libtestutils.la \
> $(DL_LIBS)
> endif
> --
> 2.17.1
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-11-05 18:11 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-11-05 16:30 [PATCH lttng-tools] fix: Re-add link to urcu-bp for _LGPL_SOURCE tests Michael Jeanson
[not found] <20191105163024.5085-1-mjeanson@efficios.com>
2019-11-05 18:11 ` Jérémie Galarneau
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).