X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=tests%2Fcli%2Fconvert%2Ftest_auto_source_discovery_params;h=0554464fb9a842d6add8674c37071db9725ba4f1;hb=1b2b6649155543b87bca6cca9b7fcafc5900dc43;hp=3a8837e6b37f3f2cddb633416e24d5eef38e42eb;hpb=1ead9076477cc6be07b0c48ce02fa40e49ddc2f0;p=babeltrace.git

diff --git a/tests/cli/convert/test_auto_source_discovery_params b/tests/cli/convert/test_auto_source_discovery_params
index 3a8837e6..0554464f 100755
--- 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,6 +40,8 @@ dir_ab="${data_dir}/dir-ab"
 expected_file=$(mktemp -t expected.XXXXXX)
 stderr_expected=/dev/null
 
+print_test_params="--params print=\"test-params\""
+
 # Apply params to two components from one leftover.
 cat > "$expected_file" <<END
 TestSourceA: ('test-allo', 'madame')
@@ -48,7 +50,7 @@ END
 
 bt_diff_cli_sorted "$expected_file" "$stderr_expected" \
 	convert --plugin-path "${plugin_dir}" \
-	"${dir_ab}" --params 'test-allo="madame"'
+	"${dir_ab}" --params 'test-allo="madame"' ${print_test_params}
 ok "$?" "apply params to two components from one leftover"
 
 # Apply params to two components from two distinct leftovers.
@@ -59,7 +61,7 @@ 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"'
+	"${dir_a}" --params 'test-allo="madame"' ${print_test_params} "${dir_b}" --params 'test-bonjour="monsieur"' ${print_test_params}
 ok "$?" "apply params to two leftovers"
 
 # Apply params to one component coming from one leftover and one component coming from two leftovers (1).
@@ -70,7 +72,7 @@ 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"'
+	"${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 leftover and one component coming from two leftovers (1)"
 
 # Apply params to one component coming from one leftover and one component coming from two leftovers (2).
@@ -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"'
+	"${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 leftover and one component coming from two leftovers (2)"
 
 rm -f "$expected_file"