[babeltrace] Test: run debug-info even with built-in plugins
Commit Message
Signed-off-by: Michael Jeanson <mjeanson at efficios.com>
---
tests/Makefile.am | 6 +-----
tests/plugins/Makefile.am | 18 +++++++++++-------
2 files changed, 12 insertions(+), 12 deletions(-)
Comments
Merged in master and stable-2.0. Thanks!
Jérémie
On 28 August 2017 at 15:04, Michael Jeanson <mjeanson at efficios.com> wrote:
> Signed-off-by: Michael Jeanson <mjeanson at efficios.com>
> ---
> tests/Makefile.am | 6 +-----
> tests/plugins/Makefile.am | 18 +++++++++++-------
> 2 files changed, 12 insertions(+), 12 deletions(-)
>
> diff --git a/tests/Makefile.am b/tests/Makefile.am
> index 10471c3..4bdbedd 100644
> --- a/tests/Makefile.am
> +++ b/tests/Makefile.am
> @@ -1,13 +1,9 @@
> -SUBDIRS = utils cli lib bindings
> +SUBDIRS = utils cli lib bindings plugins
>
> EXTRA_DIST = $(srcdir)/ctf-traces/** \
> $(srcdir)/debug-info-data/** \
> $(srcdir)/debug-info-data/.build-id/cd/**
>
> -if !ENABLE_BUILT_IN_PLUGINS
> -SUBDIRS += plugins
> -endif
> -
> if ENABLE_PYTHON_PLUGINS
> SUBDIRS += python-plugin-provider
> endif
> diff --git a/tests/plugins/Makefile.am b/tests/plugins/Makefile.am
> index ffea78b..088b28a 100644
> --- a/tests/plugins/Makefile.am
> +++ b/tests/plugins/Makefile.am
> @@ -1,5 +1,8 @@
> AM_CPPFLAGS += -I$(top_srcdir)/tests/utils -I$(top_srcdir)/plugins
>
> +LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) $(top_srcdir)/config/tap-driver.sh
> +LOG_DRIVER_FLAGS='--merge'
> +
> LIBTAP=$(top_builddir)/tests/utils/tap/libtap.la
> COMMON_TEST_LDADD = $(LIBTAP) \
> $(top_builddir)/lib/libbabeltrace.la \
> @@ -7,17 +10,18 @@ COMMON_TEST_LDADD = $(LIBTAP) \
> $(top_builddir)/logging/libbabeltrace-logging.la \
> $(top_builddir)/compat/libcompat.la
>
> -noinst_PROGRAMS = test-utils-muxer
> +check_SCRIPTS =
> +noinst_PROGRAMS =
> +TESTS =
>
> +if !ENABLE_BUILT_IN_PLUGINS
> test_utils_muxer_SOURCES = test-utils-muxer.c
> test_utils_muxer_LDADD = $(COMMON_TEST_LDADD)
>
> -check_SCRIPTS = test-utils-muxer-complete
> -
> -LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) $(top_srcdir)/config/tap-driver.sh
> -LOG_DRIVER_FLAGS='--merge'
> -
> -TESTS = test-utils-muxer-complete
> +noinst_PROGRAMS += test-utils-muxer
> +check_SCRIPTS += test-utils-muxer-complete
> +TESTS += test-utils-muxer-complete
> +endif
>
> if ENABLE_DEBUG_INFO
> test_dwarf_LDADD = \
> --
> 2.7.4
>
@@ -1,13 +1,9 @@
-SUBDIRS = utils cli lib bindings
+SUBDIRS = utils cli lib bindings plugins
EXTRA_DIST = $(srcdir)/ctf-traces/** \
$(srcdir)/debug-info-data/** \
$(srcdir)/debug-info-data/.build-id/cd/**
-if !ENABLE_BUILT_IN_PLUGINS
-SUBDIRS += plugins
-endif
-
if ENABLE_PYTHON_PLUGINS
SUBDIRS += python-plugin-provider
endif
@@ -1,5 +1,8 @@
AM_CPPFLAGS += -I$(top_srcdir)/tests/utils -I$(top_srcdir)/plugins
+LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) $(top_srcdir)/config/tap-driver.sh
+LOG_DRIVER_FLAGS='--merge'
+
LIBTAP=$(top_builddir)/tests/utils/tap/libtap.la
COMMON_TEST_LDADD = $(LIBTAP) \
$(top_builddir)/lib/libbabeltrace.la \
@@ -7,17 +10,18 @@ COMMON_TEST_LDADD = $(LIBTAP) \
$(top_builddir)/logging/libbabeltrace-logging.la \
$(top_builddir)/compat/libcompat.la
-noinst_PROGRAMS = test-utils-muxer
+check_SCRIPTS =
+noinst_PROGRAMS =
+TESTS =
+if !ENABLE_BUILT_IN_PLUGINS
test_utils_muxer_SOURCES = test-utils-muxer.c
test_utils_muxer_LDADD = $(COMMON_TEST_LDADD)
-check_SCRIPTS = test-utils-muxer-complete
-
-LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) $(top_srcdir)/config/tap-driver.sh
-LOG_DRIVER_FLAGS='--merge'
-
-TESTS = test-utils-muxer-complete
+noinst_PROGRAMS += test-utils-muxer
+check_SCRIPTS += test-utils-muxer-complete
+TESTS += test-utils-muxer-complete
+endif
if ENABLE_DEBUG_INFO
test_dwarf_LDADD = \