tests: make auto-source-discovery-grouping test use sink.text.details

[babeltrace.git] / tests / cli / convert / test_auto_source_discovery_params

diff --git a/tests/cli/convert/test_auto_source_discovery_params b/tests/cli/convert/test_auto_source_discovery_params
index 3a8837e6b37f3f2cddb633416e24d5eef38e42eb..26ed6492be1820b7dd016f3f850213b22bb9555a 100755 (executable)
--- a/tests/cli/convert/test_auto_source_discovery_params
+++ b/tests/cli/convert/test_auto_source_discovery_params
@@ -31,7 +31,7 @@ NUM_TESTS=4
 
 plan_tests $NUM_TESTS
 
-data_dir="${BT_TESTS_DATADIR}/cli/convert/auto-source-discovery-params"
+data_dir="${BT_TESTS_DATADIR}/cli/convert/auto-source-discovery-params-log-level"
 plugin_dir="${data_dir}"
 dir_a="${data_dir}/dir-a"
 dir_b="${data_dir}/dir-b"
@@ -40,7 +40,9 @@ dir_ab="${data_dir}/dir-ab"
 expected_file=$(mktemp -t expected.XXXXXX)
 stderr_expected=/dev/null
 
-# Apply params to two components from one leftover.
+print_test_params="--params print=\"test-params\""
+
+# Apply params to two components from one non-option argument.
 cat > "$expected_file" <<END
 TestSourceA: ('test-allo', 'madame')
 TestSourceB: ('test-allo', 'madame')
@@ -48,10 +50,10 @@ END
 
 bt_diff_cli_sorted "$expected_file" "$stderr_expected" \
        convert --plugin-path "${plugin_dir}" \
-       "${dir_ab}" --params 'test-allo="madame"'
-ok "$?" "apply params to two components from one leftover"
+       "${dir_ab}" --params 'test-allo="madame"' ${print_test_params}
+ok "$?" "apply params to two components from one non-option argument"
 
-# Apply params to two components from two distinct leftovers.
+# Apply params to two components from two distinct non-option arguments.
 cat > "$expected_file" <<END
 TestSourceA: ('test-allo', 'madame')
 TestSourceB: ('test-bonjour', 'monsieur')
@@ -59,10 +61,10 @@ END
 
 bt_diff_cli_sorted "$expected_file" "$stderr_expected" \
        convert --plugin-path "${plugin_dir}" \
-       "${dir_a}" --params 'test-allo="madame"' "${dir_b}" --params 'test-bonjour="monsieur"'
-ok "$?" "apply params to two leftovers"
+       "${dir_a}" --params 'test-allo="madame"' ${print_test_params} "${dir_b}" --params 'test-bonjour="monsieur"' ${print_test_params}
+ok "$?" "apply params to two non-option arguments"
 
-# Apply params to one component coming from one leftover and one component coming from two leftovers (1).
+# Apply params to one component coming from one non-option argument and one component coming from two non-option arguments (1).
 cat > "$expected_file" <<END
 TestSourceA: ('test-allo', 'madame'), ('test-bonjour', 'monsieur')
 TestSourceB: ('test-bonjour', 'monsieur')
@@ -70,10 +72,10 @@ END
 
 bt_diff_cli_sorted "$expected_file" "$stderr_expected" \
        convert --plugin-path "${plugin_dir}" \
-       "${dir_a}" --params 'test-allo="madame"' "${dir_ab}" --params 'test-bonjour="monsieur"'
-ok "$?" "apply params to one component coming from one leftover and one component coming from two leftovers (1)"
+       "${dir_a}" --params 'test-allo="madame"' ${print_test_params} "${dir_ab}" --params 'test-bonjour="monsieur"' ${print_test_params}
+ok "$?" "apply params to one component coming from one non-option argument and one component coming from two non-option arguments (1)"
 
-# Apply params to one component coming from one leftover and one component coming from two leftovers (2).
+# Apply params to one component coming from one non-option argument and one component coming from two non-option arguments (2).
 cat > "$expected_file" <<END
 TestSourceA: ('test-bonjour', 'monsieur'), ('test-salut', 'les amis')
 TestSourceB: ('test-bonjour', 'madame'), ('test-salut', 'les amis')
@@ -81,7 +83,7 @@ END
 
 bt_diff_cli_sorted "$expected_file" "$stderr_expected" \
        convert --plugin-path "${plugin_dir}" \
-       "${dir_ab}" --params 'test-bonjour="madame",test-salut="les amis"' "${dir_a}" --params 'test-bonjour="monsieur"'
-ok "$?" "apply params to one component coming from one leftover and one component coming from two leftovers (2)"
+       "${dir_ab}" --params 'test-bonjour="madame",test-salut="les amis"' ${print_test_params} "${dir_a}" --params 'test-bonjour="monsieur"' ${print_test_params}
+ok "$?" "apply params to one component coming from one non-option argument and one component coming from two non-option arguments (2)"
 
 rm -f "$expected_file"