X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=tests%2FMakefile.am;h=c4b0a0a507a4e2351e01d325d3cfd20a75b4f2b8;hb=80022dd5c49241bb4b7b967021218d476f82e09a;hp=1780f48680db703457db273ae22c503464849c3c;hpb=1f4f74e814ec230e86ccccc275d0abae2d597cf8;p=babeltrace.git

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 1780f486..c4b0a0a5 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,4 +1,11 @@
-SUBDIRS = utils lib bitfield ctf-writer plugins
+SUBDIRS = \
+	utils \
+	lib \
+	bitfield \
+	ctf-writer \
+	plugins \
+	argpar \
+	param-validation
 
 # Directories added to EXTRA_DIST will be recursively copied to the distribution.
 EXTRA_DIST = $(srcdir)/data \
@@ -9,7 +16,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 +37,20 @@ 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/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
@@ -49,19 +61,25 @@ if ENABLE_PYTHON_BINDINGS
 TESTS_BINDINGS += bindings/python/bt2/test_python_bt2
 endif
 
+TESTS_ARGPAR = \
+	argpar/test_argpar
+
 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_graph_topo \
-	lib/test_trace_ir_ref
+	lib/test_trace_ir_ref \
+	lib/test_simple_sink
 
 TESTS_BITFIELD = \
 	bitfield/test_bitfield
@@ -74,12 +92,16 @@ 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/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
+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
@@ -102,9 +124,16 @@ 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
+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 =
@@ -113,6 +142,9 @@ if ENABLE_PYTHON_PLUGINS
 TESTS_PYTHON_PLUGIN_PROVIDER += python-plugin-provider/test_python_plugin_provider
 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' \
@@ -125,10 +157,12 @@ 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) \
 	$(TESTS_LIB) \
+	$(TESTS_PARAM_VALIDATION) \
 	$(TESTS_PLUGINS) \
 	$(TESTS_PYTHON_PLUGIN_PROVIDER)
 
@@ -139,6 +173,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)))