From e511a2649d504f1e535cefa9b579f1cee2efc92c Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Tue, 25 Feb 2020 15:08:24 -0500 Subject: [PATCH] tests: fix shellcheck warnings in cli/convert/test_auto_source_discovery_{log_level,params} shellcheck complains: In test_auto_source_discovery_params line 42: print_test_params="--params what=\"test-params\"" ^---------------------------^ SC2089: Quotes/backslashes will be treated literally. Use an array. In test_auto_source_discovery_params line 68: "${dir_ab}" --params 'test-allo="madame"' ${print_test_params} \ ^------------------^ SC2090: Quotes/backslashes in this variable will not be respected. ^------------------^ SC2086: Double quote to prevent globbing and word splitting. Did you mean: "${dir_ab}" --params 'test-allo="madame"' "${print_test_params}" \ It would be cleaner to make it print_test_params an array, like we do for details_sink. Consistently double-quotes references to print_test_params and details_sink to avoid the "word splitting" warnings. Change-Id: I6b18effc29f3c453949b4c181e528e2a60cea4e4 Signed-off-by: Simon Marchi Reported-by: shellcheck Reviewed-on: https://review.lttng.org/c/babeltrace/+/3145 Tested-by: jenkins --- .../test_auto_source_discovery_log_level | 18 +++++++++--------- .../convert/test_auto_source_discovery_params | 18 +++++++++--------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/tests/cli/convert/test_auto_source_discovery_log_level b/tests/cli/convert/test_auto_source_discovery_log_level index 459a3624..e00d845b 100755 --- a/tests/cli/convert/test_auto_source_discovery_log_level +++ b/tests/cli/convert/test_auto_source_discovery_log_level @@ -39,7 +39,7 @@ dir_ab="${data_dir}/dir-ab" expected_file=$(mktemp -t expected.XXXXXX) -print_log_level="--params what=\"log-level\"" +print_log_level=(--params 'what="log-level"') details_sink=("-c" "sink.text.details" "--params=with-metadata=false") debug=2 @@ -68,8 +68,8 @@ END bt_diff_cli "$expected_file" "/dev/null" \ --plugin-path "${plugin_dir}" convert \ - "${dir_ab}" --log-level DEBUG ${print_log_level} \ - ${details_sink[@]} + "${dir_ab}" --log-level DEBUG "${print_log_level[@]}" \ + "${details_sink[@]}" ok "$?" "apply log level to two components from one non-option argument" # Apply log level to two components from two distinct non-option arguments. @@ -95,8 +95,8 @@ END bt_diff_cli "$expected_file" "/dev/null" \ --plugin-path "${plugin_dir}" convert \ - "${dir_a}" --log-level DEBUG ${print_log_level} "${dir_b}" --log-level TRACE ${print_log_level} \ - ${details_sink[@]} + "${dir_a}" --log-level DEBUG "${print_log_level[@]}" "${dir_b}" --log-level TRACE "${print_log_level[@]}" \ + "${details_sink[@]}" ok "$?" "apply log level to two non-option arguments" # Apply log level to one component coming from one non-option argument and one component coming from two non-option arguments (1). @@ -122,8 +122,8 @@ END bt_diff_cli "$expected_file" "/dev/null" \ --plugin-path "${plugin_dir}" convert \ - "${dir_a}" --log-level DEBUG ${print_log_level} "${dir_ab}" --log-level TRACE ${print_log_level} \ - ${details_sink[@]} + "${dir_a}" --log-level DEBUG "${print_log_level[@]}" "${dir_ab}" --log-level TRACE "${print_log_level[@]}" \ + "${details_sink[@]}" ok "$?" "apply log level to one component coming from one non-option argument and one component coming from two non-option arguments (1)" # Apply log level to one component coming from one non-option argument and one component coming from two non-option arguments (2). @@ -149,8 +149,8 @@ END bt_diff_cli "$expected_file" "/dev/null" \ --plugin-path "${plugin_dir}" convert \ - "${dir_ab}" --log-level DEBUG ${print_log_level} "${dir_a}" --log-level TRACE ${print_log_level} \ - ${details_sink[@]} + "${dir_ab}" --log-level DEBUG "${print_log_level[@]}" "${dir_a}" --log-level TRACE "${print_log_level[@]}" \ + "${details_sink[@]}" ok "$?" "apply log level to one component coming from one non-option argument and one component coming from two non-option arguments (2)" rm -f "$expected_file" diff --git a/tests/cli/convert/test_auto_source_discovery_params b/tests/cli/convert/test_auto_source_discovery_params index 3619a31e..27e39f85 100755 --- a/tests/cli/convert/test_auto_source_discovery_params +++ b/tests/cli/convert/test_auto_source_discovery_params @@ -39,7 +39,7 @@ dir_ab="${data_dir}/dir-ab" expected_file=$(mktemp -t expected.XXXXXX) -print_test_params="--params what=\"test-params\"" +print_test_params=("--params" 'what="test-params"') details_sink=("-c" "sink.text.details" "--params=with-metadata=false") # Apply params to two components from one non-option argument. @@ -65,8 +65,8 @@ END bt_diff_cli "$expected_file" "/dev/null" \ --plugin-path "${plugin_dir}" convert \ - "${dir_ab}" --params 'test-allo="madame"' ${print_test_params} \ - ${details_sink[@]} + "${dir_ab}" --params 'test-allo="madame"' "${print_test_params[@]}" \ + "${details_sink[@]}" ok "$?" "apply params to two components from one non-option argument" # Apply params to two components from two distinct non-option arguments. @@ -92,8 +92,8 @@ END bt_diff_cli "$expected_file" "/dev/null" \ --plugin-path "${plugin_dir}" convert \ - "${dir_a}" --params 'test-allo="madame"' ${print_test_params} "${dir_b}" --params 'test-bonjour="monsieur"' ${print_test_params} \ - ${details_sink[@]} + "${dir_a}" --params 'test-allo="madame"' "${print_test_params[@]}" "${dir_b}" --params 'test-bonjour="monsieur"' "${print_test_params[@]}" \ + "${details_sink[@]}" ok "$?" "apply params to two non-option arguments" # Apply params to one component coming from one non-option argument and one component coming from two non-option arguments (1). @@ -119,8 +119,8 @@ END bt_diff_cli "$expected_file" "/dev/null" \ --plugin-path "${plugin_dir}" convert \ - "${dir_a}" --params 'test-allo="madame"' ${print_test_params} "${dir_ab}" --params 'test-bonjour="monsieur"' ${print_test_params} \ - ${details_sink[@]} + "${dir_a}" --params 'test-allo="madame"' "${print_test_params[@]}" "${dir_ab}" --params 'test-bonjour="monsieur"' "${print_test_params[@]}" \ + "${details_sink[@]}" 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 non-option argument and one component coming from two non-option arguments (2). @@ -146,8 +146,8 @@ END bt_diff_cli "$expected_file" "/dev/null" \ --plugin-path "${plugin_dir}" convert \ - "${dir_ab}" --params 'test-bonjour="madame",test-salut="les amis"' ${print_test_params} "${dir_a}" --params 'test-bonjour="monsieur"' ${print_test_params} \ - ${details_sink[@]} + "${dir_ab}" --params 'test-bonjour="madame",test-salut="les amis"' "${print_test_params[@]}" "${dir_a}" --params 'test-bonjour="monsieur"' "${print_test_params[@]}" \ + "${details_sink[@]}" 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" -- 2.34.1