X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=tests%2FMakefile.am;h=1b44a9ccbb9711fa0d624f05ddde4bd30ca3a23d;hp=24c89fbeb9388c6bea9d48e257d1e389f1053d65;hb=e46cbefe0605ab6e66e5c1d1487c823682d3ac10;hpb=005d49d64c989f20ba4fb40833064ac2d17514ef

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 24c89fbe..1b44a9cc 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,4 +1,12 @@
-SUBDIRS = utils lib bitfield ctf-writer plugins argpar
+# SPDX-License-Identifier: MIT
+
+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 +17,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 \
@@ -35,6 +42,11 @@ 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 \
 	cli/test_output_path_ctf_non_lttng_trace \
@@ -42,6 +54,11 @@ dist_check_SCRIPTS = \
 	cli/test_trace_copy \
 	cli/test_trace_read \
 	cli/test_trimmer \
+	plugins/sink.text.details/succeed/test_succeed \
+	plugins/sink.text.pretty/test_enum \
+	plugins/sink.text.pretty/test_pretty.py \
+	plugins/sink.text.pretty/test_pretty_python \
+	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
@@ -52,11 +69,9 @@ 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 \
 	cli/test_intersection \
 	cli/test_output_path_ctf_non_lttng_trace \
 	cli/test_packet_seq_num \
@@ -65,11 +80,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
@@ -82,19 +98,19 @@ 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_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
 
@@ -112,11 +128,26 @@ 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
+	plugins/flt.utils.muxer/succeed/test_succeed \
+	plugins/sink.text.pretty/test_enum
+endif
+endif
+
+if HAVE_PYTHON
+TESTS_PLUGINS += plugins/src.ctf.lttng-live/test_live
+
+if DEV_MODE
+TESTS_LIB += lib/conds/test_conds
 endif
 endif
 
@@ -124,25 +155,28 @@ 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_python
+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)' \
 	     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_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) \
 	$(TESTS_LIB) \
+	$(TESTS_PARAM_VALIDATION) \
 	$(TESTS_PLUGINS) \
 	$(TESTS_PYTHON_PLUGIN_PROVIDER)
 
@@ -153,7 +187,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)))