X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=tests%2FMakefile.am;h=17f6a952a1d544195a677335cfe291933a4f190a;hb=493917ba0c27f2fd5d5ed7428fc590a1f03ba5d7;hp=e5f36bac31b7202af0a2c11e3a1012a44eb81956;hpb=19bb8b5a08e1ee2aadd42bf11f7ed8a62f36bd5b;p=babeltrace.git

diff --git a/tests/Makefile.am b/tests/Makefile.am
index e5f36bac..17f6a952 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = utils lib bitfield ctf-writer plugins
+SUBDIRS = utils lib bitfield ctf-writer plugins argpar
 
 # Directories added to EXTRA_DIST will be recursively copied to the distribution.
 EXTRA_DIST = $(srcdir)/data \
@@ -16,8 +16,10 @@ dist_check_SCRIPTS = \
 	bindings/python/bt2/test_field.py \
 	bindings/python/bt2/test_graph.py \
 	bindings/python/bt2/test_integer_range_set.py \
+	bindings/python/bt2/test_interrupter.py \
 	bindings/python/bt2/test_message_iterator.py \
 	bindings/python/bt2/test_message.py \
+	bindings/python/bt2/test_package.py \
 	bindings/python/bt2/test_packet.py \
 	bindings/python/bt2/test_plugin.py \
 	bindings/python/bt2/test_port.py \
@@ -29,7 +31,10 @@ 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/convert/test_auto_source_discovery_grouping \
+	cli/convert/test_auto_source_discovery_params \
+	cli/convert/test_auto_source_discovery_log_level \
+	cli/convert/test_convert_args \
 	cli/test_intersection \
 	cli/test_output_ctf_metadata \
 	cli/test_packet_seq_num \
@@ -46,10 +51,13 @@ if ENABLE_PYTHON_BINDINGS
 TESTS_BINDINGS += bindings/python/bt2/test_python_bt2
 endif
 
+TESTS_ARGPAR = \
+	argpar/test_argpar
+
 TESTS_CLI = \
+	cli/convert/test_convert_args \
 	cli/test_trace_read \
 	cli/test_packet_seq_num \
-	cli/test_convert_args \
 	cli/test_intersection \
 	cli/test_trace_copy \
 	cli/test_trimmer
@@ -58,7 +66,8 @@ TESTS_LIB = \
 	lib/test_bt_values \
 	lib/test_bt_uuid \
 	lib/test_graph_topo \
-	lib/test_trace_ir_ref
+	lib/test_trace_ir_ref \
+	lib/test_simple_sink
 
 TESTS_BITFIELD = \
 	bitfield/test_bitfield
@@ -76,11 +85,14 @@ TESTS_PLUGINS = \
 
 if !ENABLE_BUILT_IN_PLUGINS
 if ENABLE_PYTHON_BINDINGS
-TESTS_PLUGINS += plugins/src.ctf.fs/query/test_query
+TESTS_PLUGINS += plugins/src.ctf.fs/query/test_query_support_info
+TESTS_PLUGINS += plugins/src.ctf.fs/query/test_query_trace_info
+TESTS_PLUGINS += plugins/src.ctf.fs/query/test_query_metadata_info
+endif
 
 if ENABLE_DEBUG_INFO
-TESTS_PLUGINS += plugins/flt.lttng-utils.debug-info/test_lttng_utils_debug_info
-endif
+TESTS_PLUGINS += \
+	plugins/flt.lttng-utils.debug-info/test_succeed
 endif
 endif
 
@@ -98,7 +110,11 @@ endif
 
 if ENABLE_PYTHON_PLUGINS
 if ENABLE_PYTHON_BINDINGS
-TESTS_PLUGINS += plugins/flt.utils.trimmer/test_trimming
+TESTS_CLI += cli/convert/test_auto_source_discovery_grouping \
+	cli/convert/test_auto_source_discovery_log_level \
+	cli/convert/test_auto_source_discovery_params
+TESTS_PLUGINS += plugins/flt.utils.trimmer/test_trimming \
+	plugins/flt.utils.muxer/succeed/test_succeed
 endif
 endif
 
@@ -115,10 +131,12 @@ LOG_DRIVER = env AM_TAP_AWK='$(AWK)' \
 	     BT_TESTS_AWK_BIN="$(AWK)" \
 	     BT_TESTS_GREP_BIN="$(GREP)" \
 	     BT_TESTS_PYTHON_BIN="$(PYTHON)" \
+	     BT_TESTS_PYTHON_CONFIG_BIN="$(PYTHON_CONFIG)" \
 	     BT_TESTS_SED_BIN="$(SED)" \
 	     $(SHELL) $(srcdir)/utils/tap-driver.sh
 
 TESTS_NO_BITFIELD = \
+	$(TESTS_ARGPAR) \
 	$(TESTS_BINDINGS) \
 	$(TESTS_CLI) \
 	$(TESTS_CTF_WRITER) \
@@ -133,6 +151,7 @@ check-$(1):
 	$(MAKE) $(AM_MAKEFLAGS) TESTS="$2" check
 endef
 
+$(eval $(call check_target,argpar,$(TESTS_ARGPAR)))
 $(eval $(call check_target,bindings,$(TESTS_BINDINGS)))
 $(eval $(call check_target,bitfield,$(TESTS_BITFIELD)))
 $(eval $(call check_target,cli,$(TESTS_CLI)))