diff mbox series

[lttng-tools] fix: tests: link libpause_consumeron liblttng-ctl

Message ID 20190319205603.15707-1-mjeanson@efficios.com
State Accepted, archived
Delegated to: Jérémie Galarneau
Headers show
Series [lttng-tools] fix: tests: link libpause_consumeron liblttng-ctl | expand

Commit Message

Michael Jeanson March 19, 2019, 8:56 p.m. UTC
This preload test library uses symbols from liblttng-ctl which are
resolved when preloaded by GLIBC but not by MUSL.

Signed-off-by: Michael Jeanson <mjeanson at efficios.com>
---
 tests/regression/tools/notification/Makefile.am | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

Comments

Jonathan Rajotte March 20, 2019, 3:01 p.m. UTC | #1
On Tue, Mar 19, 2019 at 04:56:03PM -0400, Michael Jeanson wrote:
> This preload test library uses symbols from liblttng-ctl which are
> resolved when preloaded by GLIBC but not by MUSL.
> 

Tested-by: Jonathan Rajotte <jonathan.rajotte-julien at efficios.com>

> Signed-off-by: Michael Jeanson <mjeanson at efficios.com>
> ---
>  tests/regression/tools/notification/Makefile.am | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/tests/regression/tools/notification/Makefile.am b/tests/regression/tools/notification/Makefile.am
> index 33e95886..b869bdb1 100644
> --- a/tests/regression/tools/notification/Makefile.am
> +++ b/tests/regression/tools/notification/Makefile.am
> @@ -20,7 +20,10 @@ FORCE_SHARED_LIB_OPTIONS = -module -shared -avoid-version \
>  			   -rpath $(abs_builddir)
>  
>  libpause_consumer_la_SOURCES = consumer_testpoints.c
> -libpause_consumer_la_LIBADD = $(top_builddir)/src/common/libcommon.la $(DL_LIBS)
> +libpause_consumer_la_LIBADD = \
> +	$(top_builddir)/src/common/libcommon.la \
> +	$(top_builddir)/src/lib/lttng-ctl/liblttng-ctl.la \
> +	$(DL_LIBS)
>  libpause_consumer_la_LDFLAGS = $(FORCE_SHARED_LIB_OPTIONS)
>  noinst_LTLIBRARIES = libpause_consumer.la
>  
> -- 
> 2.17.1
> 
> _______________________________________________
> lttng-dev mailing list
> lttng-dev at lists.lttng.org
> https://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev
Jérémie Galarneau March 29, 2019, 6:18 p.m. UTC | #2
Merged in master, stable-2.11, and stable-2.10.

Thanks!
J?r?mie

On Tue, Mar 19, 2019 at 04:56:03PM -0400, Michael Jeanson wrote:
> This preload test library uses symbols from liblttng-ctl which are
> resolved when preloaded by GLIBC but not by MUSL.
> 
> Signed-off-by: Michael Jeanson <mjeanson at efficios.com>
> ---
>  tests/regression/tools/notification/Makefile.am | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/tests/regression/tools/notification/Makefile.am b/tests/regression/tools/notification/Makefile.am
> index 33e95886..b869bdb1 100644
> --- a/tests/regression/tools/notification/Makefile.am
> +++ b/tests/regression/tools/notification/Makefile.am
> @@ -20,7 +20,10 @@ FORCE_SHARED_LIB_OPTIONS = -module -shared -avoid-version \
>  			   -rpath $(abs_builddir)
>  
>  libpause_consumer_la_SOURCES = consumer_testpoints.c
> -libpause_consumer_la_LIBADD = $(top_builddir)/src/common/libcommon.la $(DL_LIBS)
> +libpause_consumer_la_LIBADD = \
> +	$(top_builddir)/src/common/libcommon.la \
> +	$(top_builddir)/src/lib/lttng-ctl/liblttng-ctl.la \
> +	$(DL_LIBS)
>  libpause_consumer_la_LDFLAGS = $(FORCE_SHARED_LIB_OPTIONS)
>  noinst_LTLIBRARIES = libpause_consumer.la
>  
> -- 
> 2.17.1
>
diff mbox series

Patch

diff --git a/tests/regression/tools/notification/Makefile.am b/tests/regression/tools/notification/Makefile.am
index 33e95886..b869bdb1 100644
--- a/tests/regression/tools/notification/Makefile.am
+++ b/tests/regression/tools/notification/Makefile.am
@@ -20,7 +20,10 @@  FORCE_SHARED_LIB_OPTIONS = -module -shared -avoid-version \
 			   -rpath $(abs_builddir)
 
 libpause_consumer_la_SOURCES = consumer_testpoints.c
-libpause_consumer_la_LIBADD = $(top_builddir)/src/common/libcommon.la $(DL_LIBS)
+libpause_consumer_la_LIBADD = \
+	$(top_builddir)/src/common/libcommon.la \
+	$(top_builddir)/src/lib/lttng-ctl/liblttng-ctl.la \
+	$(DL_LIBS)
 libpause_consumer_la_LDFLAGS = $(FORCE_SHARED_LIB_OPTIONS)
 noinst_LTLIBRARIES = libpause_consumer.la