tests: build system spring cleanup

[babeltrace.git] / tests / plugins / Makefile.am

diff --git a/tests/plugins/Makefile.am b/tests/plugins/Makefile.am
index 088b28a2cd10f31a913747d01c63ccc9f732259a..8744e8ae32fe771aed65d89920a77a7e46244c25 100644 (file)
--- a/tests/plugins/Makefile.am
+++ b/tests/plugins/Makefile.am
@@ -1,31 +1,23 @@
 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 \
-       $(top_builddir)/common/libbabeltrace-common.la \
-       $(top_builddir)/logging/libbabeltrace-logging.la \
-       $(top_builddir)/compat/libcompat.la
 
-check_SCRIPTS =
+dist_check_SCRIPTS = \
+       test_lttng_utils_debug_info.py\
+       ctf/test_query_trace_info.py
+
 noinst_PROGRAMS =
-TESTS =
 
 if !ENABLE_BUILT_IN_PLUGINS
-test_utils_muxer_SOURCES = test-utils-muxer.c
-test_utils_muxer_LDADD = $(COMMON_TEST_LDADD)
-
-noinst_PROGRAMS += test-utils-muxer
-check_SCRIPTS += test-utils-muxer-complete
-TESTS += test-utils-muxer-complete
-endif
+# plugin tests here
+endif # !ENABLE_BUILT_IN_PLUGINS
 
 if ENABLE_DEBUG_INFO
+noinst_PROGRAMS += test_dwarf test_bin_info
+
 test_dwarf_LDADD = \
-       $(top_builddir)/plugins/lttng-utils/libdebug-info.la \
+       $(top_builddir)/plugins/lttng-utils/debug-info/libdebug-info.la \
+       $(top_builddir)/fd-cache/libbabeltrace-fd-cache.la \
        $(top_builddir)/logging/libbabeltrace-logging.la \
        $(top_builddir)/common/libbabeltrace-common.la \
        $(ELFUTILS_LIBS) \
@@ -33,15 +25,11 @@ test_dwarf_LDADD = \
 test_dwarf_SOURCES = test_dwarf.c
 
 test_bin_info_LDADD = \
-       $(top_builddir)/plugins/lttng-utils/libdebug-info.la \
+       $(top_builddir)/plugins/lttng-utils/debug-info/libdebug-info.la \
+       $(top_builddir)/fd-cache/libbabeltrace-fd-cache.la \
        $(top_builddir)/logging/libbabeltrace-logging.la \
        $(top_builddir)/common/libbabeltrace-common.la \
        $(ELFUTILS_LIBS) \
        $(LIBTAP)
 test_bin_info_SOURCES = test_bin_info.c
-
-noinst_PROGRAMS += test_dwarf test_bin_info
-check_SCRIPTS += test_dwarf_complete test_bin_info_complete
-TESTS += test_dwarf_complete \
-       test_bin_info_complete
-endif
+endif # ENABLE_DEBUG_INFO