X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=tests%2FMakefile.am;h=5ffd0e0c959f45214df386ceda95c4fa6cc3226b;hb=644e036445497ef69ccf946f0700da20a5bae84f;hp=842a3858e15211b8125597a4c30fe19227799697;hpb=e30aed9ec6bb1906aa2a7972a09adce4269480c0;p=babeltrace.git

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 842a3858..5ffd0e0c 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,8 +1,7 @@
 SUBDIRS = utils lib ctf-writer plugins
 
 # Directories added to EXTRA_DIST will be recursively copied to the distribution.
-EXTRA_DIST = $(srcdir)/ctf-traces \
-	     $(srcdir)/debug-info-data \
+EXTRA_DIST = $(srcdir)/data \
 	     bindings/python/bt2/.coveragerc
 
 dist_check_SCRIPTS = \
@@ -22,6 +21,7 @@ dist_check_SCRIPTS = \
 	bindings/python/bt2/test_packet.py \
 	bindings/python/bt2/test_plugin.py \
 	bindings/python/bt2/test_port.py \
+	bindings/python/bt2/test_python_bt2 \
 	bindings/python/bt2/test_query_executor.py \
 	bindings/python/bt2/test_stream_class.py \
 	bindings/python/bt2/test_stream.py \
@@ -29,7 +29,15 @@ dist_check_SCRIPTS = \
 	bindings/python/bt2/test_trace.py \
 	bindings/python/bt2/test_value.py \
 	bindings/python/bt2/utils.py \
+	cli/test_convert_args \
+	cli/test_intersection \
+	cli/test_output_ctf_metadata \
+	cli/test_packet_seq_num \
+	cli/test_trace_copy \
+	cli/test_trace_read \
+	cli/test_trimmer \
 	python-plugin-provider/bt_plugin_test_python_plugin_provider.py \
+	python-plugin-provider/test_python_plugin_provider \
 	python-plugin-provider/test_python_plugin_provider.py
 
 TESTS_BINDINGS =
@@ -56,11 +64,7 @@ TESTS_CTF_WRITER = \
 	ctf-writer/test_ctf_writer
 
 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/test_plugin
 endif
 
 TESTS_PLUGINS = \
@@ -71,21 +75,21 @@ if ENABLE_PYTHON_BINDINGS
 TESTS_PLUGINS += plugins/src.ctf.fs/query/test_query
 
 if ENABLE_DEBUG_INFO
-TESTS_PLUGINS += plugins/test_lttng_utils_debug_info
+TESTS_PLUGINS += plugins/flt.lttng-utils.debug-info/test_lttng_utils_debug_info
 endif
 endif
 endif
 
 if ENABLE_DEBUG_INFO
 TESTS_PLUGINS += \
-	plugins/test_dwarf_i386-linux-gnu \
-	plugins/test_dwarf_powerpc-linux-gnu \
-	plugins/test_dwarf_powerpc64le-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_powerpc64le-linux-gnu \
-	plugins/test_bin_info_x86_64-linux-gnu
+	plugins/flt.lttng-utils.debug-info/test_dwarf_i386-linux-gnu \
+	plugins/flt.lttng-utils.debug-info/test_dwarf_powerpc-linux-gnu \
+	plugins/flt.lttng-utils.debug-info/test_dwarf_powerpc64le-linux-gnu \
+	plugins/flt.lttng-utils.debug-info/test_dwarf_x86_64-linux-gnu \
+	plugins/flt.lttng-utils.debug-info/test_bin_info_i386-linux-gnu \
+	plugins/flt.lttng-utils.debug-info/test_bin_info_powerpc-linux-gnu \
+	plugins/flt.lttng-utils.debug-info/test_bin_info_powerpc64le-linux-gnu \
+	plugins/flt.lttng-utils.debug-info/test_bin_info_x86_64-linux-gnu
 endif
 
 TESTS_PYTHON_PLUGIN_PROVIDER =
@@ -94,8 +98,15 @@ if ENABLE_PYTHON_PLUGINS
 TESTS_PYTHON_PLUGIN_PROVIDER += python-plugin-provider/test_python_plugin_provider
 endif
 
-LOG_DRIVER_FLAGS = '--merge'
-LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) $(top_srcdir)/config/tap-driver.sh
+LOG_DRIVER_FLAGS = --merge --comments
+LOG_DRIVER = env AM_TAP_AWK='$(AWK)' \
+	     BT_TESTS_SRCDIR='$(abs_top_srcdir)/tests' \
+	     BT_TESTS_BUILDDIR='$(abs_top_builddir)/tests' \
+	     BT_TESTS_AWK_BIN="$(AWK)" \
+	     BT_TESTS_GREP_BIN="$(GREP)" \
+	     BT_TESTS_PYTHON_BIN="$(PYTHON)" \
+	     BT_TESTS_SED_BIN="$(SED)" \
+	     $(SHELL) $(top_srcdir)/config/tap-driver.sh
 
 TESTS = $(TESTS_BINDINGS) $(TESTS_CLI) $(TESTS_CTF_WRITER) $(TESTS_LIB) \
 	$(TESTS_PLUGINS) $(TESTS_PYTHON_PLUGIN_PROVIDER)