X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=tests%2FMakefile.am;h=52df1ed04fd3279bf8d59debd03adf8d79d521ea;hb=5d30f567f8b4447c17110f3684d55008b3a570e8;hp=324c028a7c41eb7bd166987b7f882f5576b853d3;hpb=e9e36a3889cd30d2bc1a193fd87fbc0535109972;p=babeltrace.git

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 324c028a..52df1ed0 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,8 +1,8 @@
 SUBDIRS = utils cli lib bindings plugins
 
-EXTRA_DIST = $(srcdir)/ctf-traces/** \
-	     $(srcdir)/debug-info-data/** \
-	     $(srcdir)/debug-info-data/.build-id/cd/**
+# Directories added to EXTRA_DIST will be recursively copied to the distribution.
+EXTRA_DIST = $(srcdir)/ctf-traces \
+	     $(srcdir)/debug-info-data
 
 TESTS_BINDINGS =
 
@@ -25,30 +25,40 @@ TESTS_CLI = \
 
 TESTS_LIB = \
 	lib/test_bitfield \
-	lib/test_ctf_writer_complete \
 	lib/test_bt_values \
-	lib/test_ctf_ir_ref \
-	lib/test_bt_ctf_field_type_validation \
-	lib/test_ir_visit \
-	lib/test_bt_notification_heap \
+	lib/test_ctf_writer_complete \
 	lib/test_graph_topo \
-	lib/test_cc_prio_map \
-	lib/test_bt_notification_iterator
+	lib/test_trace_ir_ref
 
 if !ENABLE_BUILT_IN_PLUGINS
 TESTS_LIB += lib/test_plugin_complete
 endif
 
+if ENABLE_PYTHON_BINDINGS
+TESTS_LIB += lib/trace-ir/test_trace_ir
+TESTS_LIB += lib/ctf-writer/test_ctf_writer
+endif
+
 TESTS_PLUGINS =
 
 if !ENABLE_BUILT_IN_PLUGINS
-TESTS_PLUGINS += plugins/test-utils-muxer-complete
+if ENABLE_PYTHON_BINDINGS
+TESTS_PLUGINS += plugins/ctf/test_ctf_plugin
+
+if ENABLE_DEBUG_INFO
+TESTS_PLUGINS += plugins/test_lttng_utils_debug_info
+endif
+endif
 endif
 
 if ENABLE_DEBUG_INFO
 TESTS_PLUGINS += \
-	plugins/test_dwarf_complete \
-	plugins/test_bin_info_complete
+	plugins/test_dwarf_i386-linux-gnu \
+	plugins/test_dwarf_powerpc-linux-gnu \
+	plugins/test_dwarf_x86_64-linux-gnu \
+	plugins/test_bin_info_i386-linux-gnu \
+	plugins/test_bin_info_powerpc-linux-gnu \
+	plugins/test_bin_info_x86_64-linux-gnu
 endif
 
 TESTS_PYTHON_PLUGIN_PROVIDER =
@@ -57,8 +67,11 @@ if ENABLE_PYTHON_PLUGINS
 TESTS_PYTHON_PLUGIN_PROVIDER += python-plugin-provider/test_python_plugin_provider
 endif
 
-TESTS = $(TESTS_BINDINGS) $(TESTS_CLI) $(TESTS_LIB) $(TESTS_PLUGINS) \
-	$(TESTS_PYTHON_PLUGIN_PROVIDER)
+LOG_DRIVER_FLAGS = '--merge'
+LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) $(top_srcdir)/config/tap-driver.sh
+
+TESTS = $(TESTS_BINDINGS) $(TESTS_CLI) $(TESTS_LIB) \
+	$(TESTS_PLUGINS) $(TESTS_PYTHON_PLUGIN_PROVIDER)
 
 define check_target
 check-$(1):