Revert "tests/utils/utils.sh: quote command name when running it"
authorSimon Marchi <simon.marchi@efficios.com>
Thu, 8 Feb 2024 21:12:56 +0000 (16:12 -0500)
committerSimon Marchi <simon.marchi@efficios.com>
Fri, 9 Feb 2024 15:36:29 +0000 (10:36 -0500)
This reverts commit e612f2daa6b262796ca0750754142f0abd686f1d.

I believe that we want to do word splitting in these cases.  My
`$BT_TESTS_CC_BIN` is "ccache gcc".  Without word splitting, I get:

    /home/smarchi/src/babeltrace/tests/utils/utils.sh: line 431: ccache gcc: command not found

Change-Id: I7443dbcf1a45672cf4c7fcb7e15e94e83e85a832
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/11766
Tested-by: jenkins <jenkins@lttng.org>
Reviewed-by: Philippe Proulx <eeppeliteloop@gmail.com>
tests/utils/utils.sh

index 60e5d56e8bd5daaac2d8d21de921856f9e461c31..9ca30e1543648ab067aeeca45d19b756816d2fa6 100644 (file)
@@ -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
 
This page took 0.027049 seconds and 4 git commands to generate.