tests: reorganize CLI's `convert` tests

[babeltrace.git] / tests / Makefile.am

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 1780f48680db703457db273ae22c503464849c3c..5b641c8d469fba9571d59127af50aa63ab9fda0e 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = utils lib bitfield ctf-writer plugins
+SUBDIRS = utils lib bitfield ctf-writer plugins argpar
 
 # Directories added to EXTRA_DIST will be recursively copied to the distribution.
 EXTRA_DIST = $(srcdir)/data \
@@ -31,8 +31,8 @@ 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_convert_args \
        cli/test_intersection \
        cli/test_output_ctf_metadata \
        cli/test_packet_seq_num \
@@ -49,10 +49,13 @@ 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_trace_read \
        cli/test_packet_seq_num \
-       cli/test_convert_args \
        cli/test_intersection \
        cli/test_trace_copy \
        cli/test_trimmer
@@ -102,7 +105,7 @@ endif
 
 if ENABLE_PYTHON_PLUGINS
 if ENABLE_PYTHON_BINDINGS
-TESTS_CLI += cli/auto-source-discovery/test_auto_source_discovery
+TESTS_CLI += cli/convert/test_auto_source_discovery_grouping
 TESTS_PLUGINS += plugins/flt.utils.trimmer/test_trimming
 endif
 endif
@@ -125,6 +128,7 @@ 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) \
@@ -139,6 +143,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)))