From 9a8ce5a3c9841832a2ae47223c4ee490f0f3bc5d Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Mon, 4 Mar 2024 11:21:34 -0500 Subject: [PATCH] tests: fix readonly variables error with bash 4.4 Local variables are always visible to child functions, when they are declared readonly and the same variable name is reused this results in an error with bash 4.4. As a workaround, rename the affected variables to fix the following errors: ./tests/utils/utils.sh: line 222: args: readonly variable ./tests/utils/utils.sh: line 303: extra_details_args: readonly variable Change-Id: I7321a9940a2e69bede363acddbd5f0465a3b1433 Signed-off-by: Michael Jeanson Reviewed-on: https://review.lttng.org/c/babeltrace/+/12000 Reviewed-by: Philippe Proulx Tested-by: jenkins --- tests/utils/utils.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/utils/utils.sh b/tests/utils/utils.sh index 9ca30e15..5c7b3eeb 100644 --- a/tests/utils/utils.sh +++ b/tests/utils/utils.sh @@ -219,10 +219,10 @@ bt_cli() { shift 2 - local -r args=("$@") + local -a bt_cli_args=("$@") - echo "Running: \`$BT_TESTS_BT2_BIN ${args[*]}\`" >&2 - bt_run_in_py_env "$BT_TESTS_BT2_BIN" "${args[@]}" 1>"$stdout_file" 2>"$stderr_file" + echo "Running: \`$BT_TESTS_BT2_BIN ${bt_cli_args[*]}\`" >&2 + bt_run_in_py_env "$BT_TESTS_BT2_BIN" "${bt_cli_args[@]}" 1>"$stdout_file" 2>"$stderr_file" } # Checks the differences between: @@ -318,7 +318,7 @@ bt_diff_details_ctf_gen_single() { shift 2 - local -r extra_details_args=("$@") + local -r gen_extra_details_args=("$@") local -r temp_trace_dir=$(mktemp -d) # Run the CTF trace generator program to get a CTF trace @@ -330,7 +330,7 @@ bt_diff_details_ctf_gen_single() { # Compare using the CLI with `sink.text.details` bt_diff_details_ctf_single "$expected_stdout_file" "$temp_trace_dir" \ - "${extra_details_args[@]+${extra_details_args[@]}}" + "${gen_extra_details_args[@]+${gen_extra_details_args[@]}}" local -r ret=$? -- 2.34.1