X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=tests%2Futils%2Futils.sh;h=aa7353b7781846c708b4b5c2d9a3037dd3af72cf;hb=04c029a266e22c50c3d84f586d643abd1dd2b5b1;hp=fa511e4fdc120c4aaee66eabf3184a5f077bac4b;hpb=af34d92bc871a8e104cf0c4c5cdbb95b9832d51a;p=babeltrace.git

diff --git a/tests/utils/utils.sh b/tests/utils/utils.sh
index fa511e4f..aa7353b7 100644
--- a/tests/utils/utils.sh
+++ b/tests/utils/utils.sh
@@ -312,10 +312,10 @@ bt_diff_cli() {
 # Returns 0 if there's no difference, or 1 otherwise, also printing said
 # difference to the standard error.
 bt_diff_details_ctf_single() {
-	local expected_stdout_file="$1"
-	local trace_dir="$2"
+	local -r expected_stdout_file="$1"
+	local -r trace_dir="$2"
 	shift 2
-	local extra_details_args=("$@")
+	local -r extra_details_args=("$@")
 	expected_stderr_file="/dev/null"
 
 	# Compare using the CLI with `sink.text.details`
@@ -329,15 +329,12 @@ bt_diff_details_ctf_single() {
 # The program `$1` receives the path to a temporary, empty directory
 # where to write the CTF trace as its first argument.
 bt_diff_details_ctf_gen_single() {
-	local ctf_gen_prog_path="$1"
-	local expected_stdout_file="$2"
+	local -r ctf_gen_prog_path="$1"
+	local -r expected_stdout_file="$2"
 	shift 2
-	local extra_details_args=("$@")
-
-	local temp_trace_dir
-	local ret
+	local -r extra_details_args=("$@")
 
-	temp_trace_dir="$(mktemp -d)"
+	local -r temp_trace_dir="$(mktemp -d)"
 
 	# Run the CTF trace generator program to get a CTF trace
 	if ! "$ctf_gen_prog_path" "$temp_trace_dir" 2>/dev/null; then
@@ -349,7 +346,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[@]}}"
-	ret=$?
+	local -r ret=$?
 	rm -rf "$temp_trace_dir"
 	return $ret
 }
@@ -362,13 +359,13 @@ bt_grep() {
 # ok() with the test name `$3` on the result of bt_grep() matching the
 # pattern `$1` within the file `$2`.
 bt_grep_ok() {
-	local pattern=$1
-	local file=$2
-	local test_name=$3
+	local -r pattern=$1
+	local -r file=$2
+	local -r test_name=$3
 
 	bt_grep --silent "$pattern" "$file"
 
-	local ret=$?
+	local -r ret=$?
 
 	if ! ok $ret "$test_name"; then
 		{
@@ -405,7 +402,6 @@ run_python() {
 # Executes a command within an environment which can import the testing
 # Python modules (in `tests/utils/python`) and the `bt2` Python package.
 run_python_bt2() {
-	local lib_asan
 	local -x "BABELTRACE_PLUGIN_PATH=${BT_TESTS_BABELTRACE_PLUGIN_PATH}"
 	local -x "LIBBABELTRACE2_PLUGIN_PROVIDER_DIR=${BT_TESTS_PROVIDER_DIR}"
 	local -x "BT_TESTS_DATADIR=${BT_TESTS_DATADIR}"
@@ -413,7 +409,7 @@ run_python_bt2() {
 	local -x "BT_PLUGINS_PATH=${_bt_tests_plugins_path}"
 	local -x "PYTHONPATH=${BT_TESTS_PYTHONPATH}${PYTHONPATH:+:}${PYTHONPATH:-}"
 
-	local main_lib_path="${BT_TESTS_BUILDDIR}/../src/lib/.libs"
+	local -r main_lib_path="${BT_TESTS_BUILDDIR}/../src/lib/.libs"
 
 	# Set the library search path so that the Python 3 interpreter can
 	# load `libbabeltrace2`.
@@ -444,7 +440,7 @@ run_python_bt2() {
 	# override the user's value if it contains `detect_leaks=1`.
 	if [ "${BT_TESTS_ENABLE_ASAN:-}" = "1" ]; then
 		if "${BT_TESTS_CC_BIN}" --version | head -n 1 | bt_grep -q '^gcc'; then
-			lib_asan="$("${BT_TESTS_CC_BIN}" -print-file-name=libasan.so)"
+			local -r lib_asan="$("${BT_TESTS_CC_BIN}" -print-file-name=libasan.so)"
 			local -x LD_PRELOAD="${lib_asan}${LD_PRELOAD:+:}${LD_PRELOAD:-}"
 		fi
 
@@ -461,16 +457,8 @@ run_python_bt2() {
 # the testing Python modules (in `tests/utils/python`) and the `bt2`
 # Python package.
 run_python_bt2_test() {
-	local test_dir="$1"
-	local test_pattern="${2:-'*'}"
-
-	local ret
-	local test_runner_args=()
-
-	test_runner_args+=("$test_dir")
-	if [ -n "${test_pattern}" ]; then
-		test_runner_args+=("${test_pattern}")
-	fi
+	local -r test_dir="$1"
+	local -r test_pattern="${2:-'*'}"
 
 	if test "${BT_TESTS_COVERAGE:-}" = "1"; then
 		python_exec="check_coverage"
@@ -484,7 +472,7 @@ run_python_bt2_test() {
 		--pattern "$test_pattern" \
 		"$test_dir" \
 
-	ret=$?
+	local -r ret=$?
 
 	if test "${BT_TESTS_COVERAGE_REPORT:-}" = "1"; then
 		coverage report -m