X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=tests%2Futils%2Futils.sh;h=24cb099ae8ff0ca4b33c462cd811da1915d52ec8;hb=71646a6b7e1bbece8b7baa092c8991dce490fe6f;hp=1d49b05a6ba2060488e044a764848ffea69338cd;hpb=163f39d1a8ff2505c4349f1834dc289158daee54;p=babeltrace.git

diff --git a/tests/utils/utils.sh b/tests/utils/utils.sh
index 1d49b05a..24cb099a 100644
--- a/tests/utils/utils.sh
+++ b/tests/utils/utils.sh
@@ -457,16 +457,10 @@ 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 -r test_dir="$1"
+	local -r 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 python_exec
 
 	if test "${BT_TESTS_COVERAGE:-}" = "1"; then
 		python_exec="check_coverage"
@@ -480,7 +474,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
@@ -496,8 +490,8 @@ run_python_bt2_test() {
 # Generates a CTF trace into the directory `$2` from the moultipart
 # document `$1` using `mctf.py`.
 gen_mctf_trace() {
-	local input_file="$1"
-	local base_dir="$2"
+	local -r input_file="$1"
+	local -r base_dir="$2"
 
 	diag "Running: ${BT_TESTS_PYTHON_BIN} ${BT_TESTS_SRCDIR}/utils/python/mctf.py --base-dir ${base_dir} ${input_file}"
 	run_python "${BT_TESTS_PYTHON_BIN}" "${BT_TESTS_SRCDIR}/utils/python/mctf.py" \