X-Git-Url: https://git.efficios.com/?a=blobdiff_plain;f=tests%2Fcli%2Fconvert%2Ftest_auto_source_discovery_grouping;h=219ca0d614856e7d3ce627e7ff7009f4306ca1b3;hb=be3c0360c94492ce34219b9334048a62de7e0b14;hp=d98f689f8268da32ba869bb772ec4e265e91b7bd;hpb=8d5247bd30bb971f1927e920648088f82646daf0;p=babeltrace.git

diff --git a/tests/cli/convert/test_auto_source_discovery_grouping b/tests/cli/convert/test_auto_source_discovery_grouping
index d98f689f..219ca0d6 100755
--- a/tests/cli/convert/test_auto_source_discovery_grouping
+++ b/tests/cli/convert/test_auto_source_discovery_grouping
@@ -26,39 +26,31 @@ fi
 # shellcheck source=../../utils/utils.sh
 SH_TAP=1 source "$UTILSSH"
 
-NUM_TESTS=1
+NUM_TESTS=3
 
 plan_tests $NUM_TESTS
 
-data_dir="${BT_TESTS_DATADIR}/cli/convert/auto-source-discovery-grouping"
+data_dir="${BT_TESTS_DATADIR}/auto-source-discovery/grouping"
 plugin_dir="${data_dir}"
 trace_dir="${data_dir}/traces"
 
-if [ "$BT_OS_TYPE" = "mingw" ]; then
-	# Use Windows native paths for comparison because Unix
-	# paths are converted by the shell before they are passed
-	# to the native babeltrace2 binary.
-	trace_dir=$(cygpath -w "$trace_dir")
-	dir_sep='\'
-else
-	dir_sep='/'
-fi
+stdout_expected_file="${BT_TESTS_DATADIR}/cli/convert/auto-source-discovery-grouping.expect"
+stdout_actual_file=$(mktemp -t stdout-actual.XXXXXX)
+stderr_actual_file=$(mktemp -t actual-stderr.XXXXXX)
 
-expected_file=$(mktemp -t expected.XXXXXX)
-stderr_expected=/dev/null
+bt_cli "$stdout_actual_file" "$stderr_actual_file" \
+	--plugin-path "${plugin_dir}" convert "ABCDE" "${trace_dir}" some_other_non_opt \
+	-c sink.text.details --params='with-metadata=false'
+ok "$?" "CLI runs successfully"
 
-cat > "$expected_file" <<END
-TestSourceABCDE: ABCDE
-TestSourceExt: ${trace_dir}${dir_sep}aaa1, ${trace_dir}${dir_sep}aaa2, ${trace_dir}${dir_sep}aaa3
-TestSourceExt: ${trace_dir}${dir_sep}bbb1, ${trace_dir}${dir_sep}bbb2
-TestSourceExt: ${trace_dir}${dir_sep}ccc1
-TestSourceExt: ${trace_dir}${dir_sep}ccc2
-TestSourceExt: ${trace_dir}${dir_sep}ccc3
-TestSourceExt: ${trace_dir}${dir_sep}ccc4
-TestSourceSomeDir: ${trace_dir}${dir_sep}some-dir
-END
+# Check components and their inputs.
+bt_diff "$stdout_expected_file" "$stdout_actual_file"
+ok "$?" "expected components are instantiated with expected inputs"
 
-bt_diff_cli_sorted "$expected_file" "$stderr_expected" convert --plugin-path "${plugin_dir}" "ABCDE" "${trace_dir}" some_other_non_opt
-ok "$?" "sources are auto-discovered"
+# Check that expected warning is printed.
+# shellcheck disable=SC2016
+grep -q 'No trace was found based on input `some_other_non_opt`' "$stderr_actual_file"
+ok "$?" "warning is printed"
 
-rm -f "$expected_file"
+rm -f "$stdout_actual_file"
+rm -f "$stderr_actual_file"