X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=tests%2Futils%2Futils.sh;fp=tests%2Futils%2Futils.sh;h=5c7b3eeb54e43bb465c1225da9292e258a2a2811;hp=9ca30e1543648ab067aeeca45d19b756816d2fa6;hb=9a8ce5a3c9841832a2ae47223c4ee490f0f3bc5d;hpb=c7c713df66cf2049021ada3a5b6a82ba075e0a7d

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=$?