X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=tests%2FMakefile.am;h=f310d11b8b33d600f1b30ea856fff0d75328a695;hb=40dc9e54dfad83dd06e16ea147b6ec8f341cf1dd;hp=1550d22909e28fe08a81dc253566486ce93216f1;hpb=6091410a4ecbd389501c7fc977d2e30eb432f07f;p=babeltrace.git

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 1550d229..f310d11b 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.
@@ -16,7 +15,6 @@ dist_check_SCRIPTS = \
 	bindings/python/bt2/test_component_class.py \
 	bindings/python/bt2/test_component.py \
 	bindings/python/bt2/test_connection.py \
-	bindings/python/bt2/test_ctf_writer_clock.py \
 	bindings/python/bt2/test_event_class.py \
 	bindings/python/bt2/test_event.py \
 	bindings/python/bt2/test_field_class.py \
@@ -42,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 \
@@ -51,6 +53,8 @@ dist_check_SCRIPTS = \
 	cli/test_trace_read \
 	cli/test_trimmer \
 	plugins/sink.text.details/succeed/test_succeed \
+	plugins/sink.text.pretty/test_pretty \
+	plugins/sink.text.pretty/test_pretty.py \
 	plugins/src.ctf.lttng-live/test_live \
 	python-plugin-provider/bt_plugin_test_python_plugin_provider.py \
 	python-plugin-provider/test_python_plugin_provider \
@@ -62,9 +66,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 \
@@ -76,11 +77,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
@@ -93,7 +95,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 +106,8 @@ if ENABLE_PYTHON_BINDINGS
 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
+TESTS_PLUGINS += plugins/sink.ctf.fs/test_assume_single_trace
+TESTS_PLUGINS += plugins/sink.ctf.fs/test_stream_names
 endif
 endif
 
@@ -124,9 +125,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
@@ -140,6 +147,11 @@ TESTS_PYTHON_PLUGIN_PROVIDER =
 
 if ENABLE_PYTHON_PLUGINS
 TESTS_PYTHON_PLUGIN_PROVIDER += python-plugin-provider/test_python_plugin_provider
+TESTS_PLUGINS += plugins/sink.text.pretty/test_pretty
+if ENABLE_DEBUG_INFO
+TESTS_PLUGINS += \
+	plugins/flt.lttng-utils.debug-info/test_succeed
+endif
 endif
 
 TESTS_PARAM_VALIDATION = \
@@ -157,7 +169,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) \
@@ -173,7 +184,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)))