Test: run debug-info even with built-in plugins
authorMichael Jeanson <mjeanson@efficios.com>
Mon, 28 Aug 2017 19:04:28 +0000 (15:04 -0400)
committerJérémie Galarneau <jeremie.galarneau@efficios.com>
Tue, 29 Aug 2017 16:18:08 +0000 (12:18 -0400)
Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
tests/Makefile.am
tests/plugins/Makefile.am

index 10471c3418cab175d25835e929e76968ae934306..4bdbedd0ccc496ab11bb1b2164f4eba1be737b3f 100644 (file)
@@ -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/**
 
 
 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
 if ENABLE_PYTHON_PLUGINS
 SUBDIRS += python-plugin-provider
 endif
index ffea78bd90f4c1a3d30a29c9f1c4b9e4fe8bcb19..088b28a2cd10f31a913747d01c63ccc9f732259a 100644 (file)
@@ -1,5 +1,8 @@
 AM_CPPFLAGS += -I$(top_srcdir)/tests/utils -I$(top_srcdir)/plugins
 
 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 \
 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
 
        $(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)
 
 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 = \
 
 if ENABLE_DEBUG_INFO
 test_dwarf_LDADD = \
This page took 0.026823 seconds and 4 git commands to generate.