X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=tests%2FMakefile.am;h=1b44a9ccbb9711fa0d624f05ddde4bd30ca3a23d;hb=900ddc21d5dd2d67c6a7330eb7bde4ccfda114b9;hp=6db5cd480e4b86b967e90abbe84f8f839122d81e;hpb=8bd8ac79b9201c0be3ac8916d12ade0194e76437;p=babeltrace.git

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 6db5cd48..1b44a9cc 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,10 +1,11 @@
+# SPDX-License-Identifier: MIT
+
 SUBDIRS = \
 	utils \
 	lib \
 	bitfield \
 	ctf-writer \
 	plugins \
-	argpar \
 	param-validation
 
 # Directories added to EXTRA_DIST will be recursively copied to the distribution.
@@ -41,6 +42,7 @@ 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 \
@@ -53,6 +55,9 @@ dist_check_SCRIPTS = \
 	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 \
@@ -64,9 +69,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 \
@@ -107,6 +109,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
+TESTS_PLUGINS += plugins/sink.ctf.fs/test_assume_single_trace
+TESTS_PLUGINS += plugins/sink.ctf.fs/test_stream_names
 endif
 endif
 
@@ -128,23 +132,30 @@ 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
+	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
 
 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
@@ -158,15 +169,9 @@ 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) \
@@ -182,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)))