X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=tests%2Fplugins%2FMakefile.am;h=015f775fbf82736a7ea106d74d4c97e21edacccd;hb=57952005b6a6a0aeb1e4ecb0d7ac0c6786d23dba;hp=a4055dddb437647ffe4971ed7cf117f8420bf0ec;hpb=c80d4c65ee2320f014281e979bb732ad1bf14ce9;p=babeltrace.git

diff --git a/tests/plugins/Makefile.am b/tests/plugins/Makefile.am
index a4055ddd..015f775f 100644
--- a/tests/plugins/Makefile.am
+++ b/tests/plugins/Makefile.am
@@ -1,10 +1,11 @@
-SUBDIRS = ctf
-
-AM_CPPFLAGS += -I$(top_srcdir)/tests/utils -I$(top_srcdir)/plugins
+AM_CPPFLAGS += -I$(top_srcdir)/tests/utils -I$(top_srcdir)/src/plugins
 
 LIBTAP=$(top_builddir)/tests/utils/tap/libtap.la
 
-check_SCRIPTS =
+dist_check_SCRIPTS = \
+	test_lttng_utils_debug_info.py\
+	ctf/test_query_trace_info.py
+
 noinst_PROGRAMS =
 
 if !ENABLE_BUILT_IN_PLUGINS
@@ -12,32 +13,23 @@ if !ENABLE_BUILT_IN_PLUGINS
 endif # !ENABLE_BUILT_IN_PLUGINS
 
 if ENABLE_DEBUG_INFO
+noinst_PROGRAMS += test_dwarf test_bin_info
+
 test_dwarf_LDADD = \
-	$(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 \
+	$(top_builddir)/src/plugins/lttng-utils/debug-info/libdebug-info.la \
+	$(top_builddir)/src/fd-cache/libbabeltrace2-fd-cache.la \
+	$(top_builddir)/src/logging/libbabeltrace2-logging.la \
+	$(top_builddir)/src/common/libbabeltrace2-common.la \
 	$(ELFUTILS_LIBS) \
 	$(LIBTAP)
 test_dwarf_SOURCES = test_dwarf.c
 
 test_bin_info_LDADD = \
-	$(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 \
+	$(top_builddir)/src/plugins/lttng-utils/debug-info/libdebug-info.la \
+	$(top_builddir)/src/fd-cache/libbabeltrace2-fd-cache.la \
+	$(top_builddir)/src/logging/libbabeltrace2-logging.la \
+	$(top_builddir)/src/common/libbabeltrace2-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
-
-if !ENABLE_BUILT_IN_PLUGINS
-if ENABLE_PYTHON_BINDINGS
-check_SCRIPTS += test_lttng_utils_debug_info
-endif # !ENABLE_BUILT_IN_PLUGINS
-endif # ENABLE_PYTHON_BINDINGS
 endif # ENABLE_DEBUG_INFO
-
-EXTRA_DIST = test_lttng_utils_debug_info.py