From ce0098bd36c3f818bf0beb50dc3cbfba61a6f2a3 Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Tue, 25 Feb 2020 14:04:18 -0500 Subject: [PATCH] tests: fix shellcheck warnings in plugins/flt.lttng-utils.debug-info/test_succeed Fix the path to utils.sh, so that shellcheck finds it. Then, fix: In test_succeed line 38: this_dir_build="$BT_TESTS_BUILDDIR/$this_dir_relative" ^------------^ SC2034: this_dir_build appears unused. Verify use (or export if used externally). In test_succeed line 70: local actual_stdout=$(mktemp -t test_debug_info_stdout_actual.XXXXXX) ^-----------^ SC2155: Declare and assign separately to avoid masking return values. In test_succeed line 71: local actual_stderr=$(mktemp -t test_debug_info_stderr_actual.XXXXXX) ^-----------^ SC2155: Declare and assign separately to avoid masking return values. In test_succeed line 72: local expected_stdout=$(mktemp -t test_debug_info_stdout_expected.XXXXXX) ^-------------^ SC2155: Declare and assign separately to avoid masking return values. In test_succeed line 73: local expected_stderr=$(mktemp -t test_debug_info_stderr_expected.XXXXXX) ^-------------^ SC2155: Declare and assign separately to avoid masking return values. Change-Id: Id9f0d3be21ef215a416946b702f915d98fb539d2 Signed-off-by: Simon Marchi Reported-by: shellcheck Reviewed-on: https://review.lttng.org/c/babeltrace/+/3136 Tested-by: jenkins --- .../flt.lttng-utils.debug-info/test_succeed | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/tests/plugins/flt.lttng-utils.debug-info/test_succeed b/tests/plugins/flt.lttng-utils.debug-info/test_succeed index 76b299fe..8a4c07b0 100755 --- a/tests/plugins/flt.lttng-utils.debug-info/test_succeed +++ b/tests/plugins/flt.lttng-utils.debug-info/test_succeed @@ -31,11 +31,10 @@ else UTILSSH="$(dirname "$0")/../../utils/utils.sh" fi -# shellcheck source=../../../utils/utils.sh +# shellcheck source=../../utils/utils.sh source "$UTILSSH" this_dir_relative="plugins/flt.lttng-utils.debug-info" -this_dir_build="$BT_TESTS_BUILDDIR/$this_dir_relative" succeed_trace_dir="$BT_CTF_TRACES_PATH/succeed" expect_dir="$BT_TESTS_DATADIR/$this_dir_relative" binary_artefact_dir="$BT_TESTS_DATADIR/$this_dir_relative" @@ -67,12 +66,17 @@ test_compare_to_ctf_fs() { "-c" "sink.text.details" "--params" "with-trace-name=false,with-stream-name=false,with-uuid=false" ) - local actual_stdout=$(mktemp -t test_debug_info_stdout_actual.XXXXXX) - local actual_stderr=$(mktemp -t test_debug_info_stderr_actual.XXXXXX) - local expected_stdout=$(mktemp -t test_debug_info_stdout_expected.XXXXXX) - local expected_stderr=$(mktemp -t test_debug_info_stderr_expected.XXXXXX) + local actual_stdout + local actual_stderr + local expected_stdout + local expected_stderr local ret=0 + actual_stdout=$(mktemp -t test_debug_info_stdout_actual.XXXXXX) + actual_stderr=$(mktemp -t test_debug_info_stderr_actual.XXXXXX) + expected_stdout=$(mktemp -t test_debug_info_stdout_expected.XXXXXX) + expected_stderr=$(mktemp -t test_debug_info_stderr_expected.XXXXXX) + # Create expected files using a graph without a `debug-info` component. bt_cli "$expected_stdout" "$expected_stderr" "${cli_args[@]}" \ "${details_cli_args[@]}" -- 2.34.1