From 0374584e32997f5f39f835f0a5a4807ac7e68f45 Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Wed, 20 Nov 2019 11:12:45 -0500 Subject: [PATCH] tests: declare and assign variables separately in test_exit_status Fixes these shellcheck errors: In test_exit_status line 34: local actual_stdout=$(mktemp -t test_cli_exit_status_stdout_actual.XXXXXX) ^-----------^ SC2155: Declare and assign separately to avoid masking return values. In test_exit_status line 35: local actual_stderr=$(mktemp -t test_cli_exit_status_stderr_actual.XXXXXX) ^-----------^ SC2155: Declare and assign separately to avoid masking return values. In test_exit_status line 53: local actual_stdout=$(mktemp -t test_cli_exit_status_stdout_actual.XXXXXX) ^-----------^ SC2155: Declare and assign separately to avoid masking return values. In test_exit_status line 54: local actual_stderr=$(mktemp -t test_cli_exit_status_stderr_actual.XXXXXX) ^-----------^ SC2155: Declare and assign separately to avoid masking return values. In test_exit_status line 72: local actual_stdout=$(mktemp -t test_cli_exit_status_stdout_actual.XXXXXX) ^-----------^ SC2155: Declare and assign separately to avoid masking return values. In test_exit_status line 73: local actual_stderr=$(mktemp -t test_cli_exit_status_stderr_actual.XXXXXX) ^-----------^ SC2155: Declare and assign separately to avoid masking return values. Reported-by: shellcheck Change-Id: Iddb1c4e8b0a3bc1c37cc08a37b1103d97b8560e7 Signed-off-by: Simon Marchi Reviewed-on: https://review.lttng.org/c/babeltrace/+/2416 Tested-by: jenkins --- tests/cli/test_exit_status | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/tests/cli/test_exit_status b/tests/cli/test_exit_status index 3e6f5029..01b0632e 100755 --- a/tests/cli/test_exit_status +++ b/tests/cli/test_exit_status @@ -31,8 +31,11 @@ source_name="src.test_exit_status.StatusSrc" test_interrupted_graph() { local cli_args=("--plugin-path=$data_dir" "-c" "$source_name" "-p" "case=\"INTERRUPTED\"") - local actual_stdout=$(mktemp -t test_cli_exit_status_stdout_actual.XXXXXX) - local actual_stderr=$(mktemp -t test_cli_exit_status_stderr_actual.XXXXXX) + local actual_stdout + local actual_stderr + + actual_stdout=$(mktemp -t test_cli_exit_status_stdout_actual.XXXXXX) + actual_stderr=$(mktemp -t test_cli_exit_status_stderr_actual.XXXXXX) bt_cli "$actual_stdout" "$actual_stderr" "${cli_args[@]}" @@ -50,8 +53,11 @@ test_interrupted_graph() { test_error_graph() { local cli_args=("--plugin-path=$data_dir" "-c" "$source_name" "-p" "case=\"ERROR\"") - local actual_stdout=$(mktemp -t test_cli_exit_status_stdout_actual.XXXXXX) - local actual_stderr=$(mktemp -t test_cli_exit_status_stderr_actual.XXXXXX) + local actual_stdout + local actual_stderr + + actual_stdout=$(mktemp -t test_cli_exit_status_stdout_actual.XXXXXX) + actual_stderr=$(mktemp -t test_cli_exit_status_stderr_actual.XXXXXX) bt_cli "$actual_stdout" "$actual_stderr" "${cli_args[@]}" @@ -69,8 +75,11 @@ test_error_graph() { test_stop_graph() { local cli_args=("--plugin-path=$data_dir" "-c" "$source_name" "-p" "case=\"STOP\"") - local actual_stdout=$(mktemp -t test_cli_exit_status_stdout_actual.XXXXXX) - local actual_stderr=$(mktemp -t test_cli_exit_status_stderr_actual.XXXXXX) + local actual_stdout + local actual_stderr + + actual_stdout=$(mktemp -t test_cli_exit_status_stdout_actual.XXXXXX) + actual_stderr=$(mktemp -t test_cli_exit_status_stderr_actual.XXXXXX) bt_cli "$actual_stdout" "$actual_stderr" "${cli_args[@]}" -- 2.34.1