X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=tests%2Futils%2Futils.sh;h=1d49b05a6ba2060488e044a764848ffea69338cd;hb=163f39d1a8ff2505c4349f1834dc289158daee54;hp=9291db8833e6a8340e0452276d2714788ccd2ed5;hpb=69b5f89d44dcaa47deefd919624f3e793f6d1b75;p=babeltrace.git diff --git a/tests/utils/utils.sh b/tests/utils/utils.sh index 9291db88..1d49b05a 100644 --- a/tests/utils/utils.sh +++ b/tests/utils/utils.sh @@ -359,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 { @@ -402,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}" @@ -410,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`. @@ -441,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