X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=tests%2FMakefile.am;h=c5f62e11be9920f7d7e7caa8bca80fae593ca9cf;hb=03a71671e4d8d483ff6d765082e6ebf1df9ef3e5;hp=1780f48680db703457db273ae22c503464849c3c;hpb=6c0b3817e625425be12f7ed0596d31453e75ea63;p=babeltrace.git

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 1780f486..c5f62e11 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,4 +1,10 @@
-SUBDIRS = utils lib bitfield ctf-writer plugins
+SUBDIRS = \
+	utils \
+	lib \
+	bitfield \
+	ctf-writer \
+	plugins \
+	param-validation
 
 # Directories added to EXTRA_DIST will be recursively copied to the distribution.
 EXTRA_DIST = $(srcdir)/data \
@@ -9,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 \
@@ -31,14 +36,24 @@ dist_check_SCRIPTS = \
 	bindings/python/bt2/test_trace.py \
 	bindings/python/bt2/test_value.py \
 	bindings/python/bt2/utils.py \
-	cli/auto-source-discovery/test_auto_source_discovery \
-	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/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 \
+	cli/test_output_path_ctf_non_lttng_trace \
 	cli/test_packet_seq_num \
 	cli/test_trace_copy \
 	cli/test_trace_read \
 	cli/test_trimmer \
+	plugins/sink.text.details/succeed/test_succeed \
+	plugins/src.ctf.lttng-live/test_live \
 	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
@@ -50,17 +65,21 @@ TESTS_BINDINGS += bindings/python/bt2/test_python_bt2
 endif
 
 TESTS_CLI = \
-	cli/test_trace_read \
-	cli/test_packet_seq_num \
-	cli/test_convert_args \
+	cli/convert/test_convert_args \
+	cli/test_help \
 	cli/test_intersection \
+	cli/test_output_path_ctf_non_lttng_trace \
+	cli/test_packet_seq_num \
 	cli/test_trace_copy \
+	cli/test_trace_read \
 	cli/test_trimmer
 
 TESTS_LIB = \
-	lib/test_bt_values \
 	lib/test_bt_uuid \
+	lib/test_bt_values \
 	lib/test_graph_topo \
+	lib/test_remove_destruction_listener_in_destruction_listener \
+	lib/test_simple_sink \
 	lib/test_trace_ir_ref
 
 TESTS_BITFIELD = \
@@ -74,17 +93,17 @@ TESTS_LIB += lib/test_plugin
 endif
 
 TESTS_PLUGINS = \
+	plugins/src.ctf.fs/fail/test_fail \
 	plugins/src.ctf.fs/succeed/test_succeed \
-	plugins/sink.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
 
 if !ENABLE_BUILT_IN_PLUGINS
 if ENABLE_PYTHON_BINDINGS
-TESTS_PLUGINS += plugins/src.ctf.fs/query/test_query
-endif
-
-if ENABLE_DEBUG_INFO
-TESTS_PLUGINS += \
-	plugins/flt.lttng-utils.debug-info/test_succeed
+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
 endif
 
@@ -102,16 +121,36 @@ endif
 
 if ENABLE_PYTHON_PLUGINS
 if ENABLE_PYTHON_BINDINGS
-TESTS_CLI += cli/auto-source-discovery/test_auto_source_discovery
-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 \
+	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
 endif
 
+if HAVE_PYTHON
+TESTS_PLUGINS += plugins/src.ctf.lttng-live/test_live
+endif
+
 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 = \
+	param-validation/test_param_validation
 
 LOG_DRIVER_FLAGS = --merge --comments
 LOG_DRIVER = env AM_TAP_AWK='$(AWK)' \
@@ -129,6 +168,7 @@ TESTS_NO_BITFIELD = \
 	$(TESTS_CLI) \
 	$(TESTS_CTF_WRITER) \
 	$(TESTS_LIB) \
+	$(TESTS_PARAM_VALIDATION) \
 	$(TESTS_PLUGINS) \
 	$(TESTS_PYTHON_PLUGIN_PROVIDER)