tests: fix unbound variables in env.sh

[babeltrace.git] / tests / utils / utils.sh

diff --git a/tests/utils/utils.sh b/tests/utils/utils.sh
index b14b806429bfd8323e47efcd9c402ece8d8f444e..9ca30e1543648ab067aeeca45d19b756816d2fa6 100644 (file)
--- a/tests/utils/utils.sh
+++ b/tests/utils/utils.sh
@@ -156,7 +156,7 @@ _bt_tests_set_var_def BT_TESTS_PYTHON_BIN python3
 #
 # This doesn't need to be exported, but it needs to remain set for
 # bt_run_in_py_utils_env() to use it.
-_bt_tests_py3_version=$("$BT_TESTS_PYTHON_BIN" -c 'import sys; print("{}.{}".format(sys.version_info.major, sys.version_info.minor))')
+_bt_tests_py3_version=$($BT_TESTS_PYTHON_BIN -c 'import sys; print("{}.{}".format(sys.version_info.major, sys.version_info.minor))')
 
 # Name of the `python3-config` command to use when testing, if not set
 _bt_tests_set_var_def BT_TESTS_PYTHON_CONFIG_BIN python3-config
@@ -416,7 +416,7 @@ bt_run_in_py_env() {
        if [[ $BT_TESTS_OS_TYPE == mingw ]]; then
                local -x PYTHONHOME
 
-               PYTHONHOME=$("$BT_TESTS_PYTHON_CONFIG_BIN" --prefix)
+               PYTHONHOME=$($BT_TESTS_PYTHON_CONFIG_BIN --prefix)
        fi
 
        # If AddressSanitizer is used, we must preload `libasan.so` so that
@@ -428,8 +428,8 @@ bt_run_in_py_env() {
        # Append it to existing `ASAN_OPTIONS` variable, such that we
        # 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
-                       local -r lib_asan=$("$BT_TESTS_CC_BIN" -print-file-name=libasan.so)
+               if $BT_TESTS_CC_BIN --version | head -n 1 | bt_grep -q '^gcc'; then
+                       local -r lib_asan=$($BT_TESTS_CC_BIN -print-file-name=libasan.so)
                        local -x LD_PRELOAD=$lib_asan${LD_PRELOAD:+:}${LD_PRELOAD:-}
                fi
 
@@ -445,7 +445,7 @@ bt_run_in_py_env() {
 # This function uses bt_run_in_py_env(), therefore such tests can import
 # the testing Python modules (in `tests/utils/python`) and the `bt2`
 # Python package.
-run_python_bt2_test() {
+bt_run_py_test() {
        local -r test_dir=$1
        local -r test_pattern=${2:-*}
        local python_exec
@@ -475,7 +475,7 @@ run_python_bt2_test() {
 
 # Generates a CTF trace into the directory `$2` from the moultipart
 # document `$1` using `mctf.py`.
-gen_mctf_trace() {
+bt_gen_mctf_trace() {
        local -r input_file=$1
        local -r base_dir=$2
        local -r cmd=(