X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=tests%2FMakefile.am;h=c5f62e11be9920f7d7e7caa8bca80fae593ca9cf;hb=5c61fb9d5be835a0efc87f7764117c4d05e0ae5a;hp=542b06c8ba428977bb3f3f5e4e4efd38aa6a4b68;hpb=9d977f63ed2a5b61f7adffa12a28667e73b898a7;p=babeltrace.git

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 542b06c8..c5f62e11 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -4,7 +4,6 @@ SUBDIRS = \
 	bitfield \
 	ctf-writer \
 	plugins \
-	argpar \
 	param-validation
 
 # Directories added to EXTRA_DIST will be recursively copied to the distribution.
@@ -41,6 +40,10 @@ dist_check_SCRIPTS = \
 	cli/convert/test_auto_source_discovery_params \
 	cli/convert/test_auto_source_discovery_log_level \
 	cli/convert/test_convert_args \
+	cli/list-plugins/test_list_plugins \
+	cli/params/test_params \
+	cli/query/test_query \
+	cli/test_exit_status \
 	cli/test_help \
 	cli/test_intersection \
 	cli/test_output_ctf_metadata \
@@ -61,9 +64,6 @@ 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_help \
@@ -75,11 +75,12 @@ TESTS_CLI = \
 	cli/test_trimmer
 
 TESTS_LIB = \
-	lib/test_bt_values \
 	lib/test_bt_uuid \
+	lib/test_bt_values \
 	lib/test_graph_topo \
-	lib/test_trace_ir_ref \
-	lib/test_simple_sink
+	lib/test_remove_destruction_listener_in_destruction_listener \
+	lib/test_simple_sink \
+	lib/test_trace_ir_ref
 
 TESTS_BITFIELD = \
 	bitfield/test_bitfield
@@ -92,7 +93,9 @@ TESTS_LIB += lib/test_plugin
 endif
 
 TESTS_PLUGINS = \
+	plugins/src.ctf.fs/fail/test_fail \
 	plugins/src.ctf.fs/succeed/test_succeed \
+	plugins/src.ctf.fs/test_deterministic_ordering \
 	plugins/sink.ctf.fs/succeed/test_succeed \
 	plugins/sink.text.details/succeed/test_succeed
 
@@ -102,11 +105,6 @@ 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_succeed
-endif
 endif
 
 if ENABLE_DEBUG_INFO
@@ -123,9 +121,15 @@ endif
 
 if ENABLE_PYTHON_PLUGINS
 if ENABLE_PYTHON_BINDINGS
-TESTS_CLI += cli/convert/test_auto_source_discovery_grouping \
+TESTS_CLI += \
+	cli/convert/test_auto_source_discovery_grouping \
 	cli/convert/test_auto_source_discovery_log_level \
-	cli/convert/test_auto_source_discovery_params
+	cli/convert/test_auto_source_discovery_params \
+	cli/list-plugins/test_list_plugins \
+	cli/params/test_params \
+	cli/query/test_query \
+	cli/test_exit_status
+
 TESTS_PLUGINS += plugins/flt.utils.trimmer/test_trimming \
 	plugins/flt.utils.muxer/succeed/test_succeed
 endif
@@ -139,6 +143,10 @@ TESTS_PYTHON_PLUGIN_PROVIDER =
 
 if ENABLE_PYTHON_PLUGINS
 TESTS_PYTHON_PLUGIN_PROVIDER += python-plugin-provider/test_python_plugin_provider
+if ENABLE_DEBUG_INFO
+TESTS_PLUGINS += \
+	plugins/flt.lttng-utils.debug-info/test_succeed
+endif
 endif
 
 TESTS_PARAM_VALIDATION = \
@@ -156,7 +164,6 @@ LOG_DRIVER = env AM_TAP_AWK='$(AWK)' \
 	     $(SHELL) $(srcdir)/utils/tap-driver.sh
 
 TESTS_NO_BITFIELD = \
-	$(TESTS_ARGPAR) \
 	$(TESTS_BINDINGS) \
 	$(TESTS_CLI) \
 	$(TESTS_CTF_WRITER) \
@@ -172,7 +179,6 @@ 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)))