tests: fix readonly variables error with bash 4.4
authorMichael Jeanson <mjeanson@efficios.com>
Mon, 4 Mar 2024 16:21:34 +0000 (11:21 -0500)
committerPhilippe Proulx <eeppeliteloop@gmail.com>
Mon, 4 Mar 2024 20:53:25 +0000 (15:53 -0500)
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 <mjeanson@efficios.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/12000
Reviewed-by: Philippe Proulx <eeppeliteloop@gmail.com>
Tested-by: jenkins <jenkins@lttng.org>
tests/utils/utils.sh

index 9ca30e1543648ab067aeeca45d19b756816d2fa6..5c7b3eeb54e43bb465c1225da9292e258a2a2811 100644 (file)
@@ -219,10 +219,10 @@ bt_cli() {
 
        shift 2
 
-       local -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=$?
 
This page took 0.025206 seconds and 4 git commands to generate.