X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=tests%2Futils%2Futils.sh;h=937496457b70ade86e19b63f67ecf22123016e65;hb=61ef15c97af7879aff69169dbcf940a4b75b193b;hp=ada568b8dd5d0d31dfbdc5e2cacda548a45a1512;hpb=7030f9fe4fef4bc2a1f1ea3e6cd66ac38b4fcf61;p=babeltrace.git diff --git a/tests/utils/utils.sh b/tests/utils/utils.sh index ada568b8..93749645 100644 --- a/tests/utils/utils.sh +++ b/tests/utils/utils.sh @@ -95,11 +95,18 @@ _set_vars_srcdir_builddir() { _set_vars_srcdir_builddir unset -f _set_vars_srcdir_builddir -# Source the generated environment file if it's present -if [ -f "${BT_TESTS_BUILDDIR}/utils/env.sh" ]; then - # shellcheck disable=SC1091 - . "${BT_TESTS_BUILDDIR}/utils/env.sh" -fi +# Sources the generated environment file (`env.sh`) if it exists. +_source_env_sh() { + local -r env_sh_path="$BT_TESTS_BUILDDIR/utils/env.sh" + + if [ -f "${env_sh_path}" ]; then + # shellcheck disable=SC1090,SC1091 + . "${env_sh_path}" + fi +} + +_source_env_sh +unset -f _source_env_sh # Path to the `babeltrace2` command, if not set if [ -z "${BT_TESTS_BT2_BIN:-}" ]; then @@ -114,11 +121,11 @@ export BT_TESTS_BT2_BIN # run_python_bt2() to use it. # # TODO: Remove when `tests/bindings/python/bt2/test_plugin.py` is fixed. -BT_PLUGINS_PATH="${BT_TESTS_BUILDDIR}/../src/plugins" +_bt_tests_plugins_path="${BT_TESTS_BUILDDIR}/../src/plugins" # Colon-separated list of project plugin paths, if not set if [ -z "${BT_TESTS_BABELTRACE_PLUGIN_PATH:-}" ]; then - BT_TESTS_BABELTRACE_PLUGIN_PATH="${BT_PLUGINS_PATH}/ctf:${BT_PLUGINS_PATH}/utils:${BT_PLUGINS_PATH}/text:${BT_PLUGINS_PATH}/lttng-utils" + BT_TESTS_BABELTRACE_PLUGIN_PATH="${_bt_tests_plugins_path}/ctf:${_bt_tests_plugins_path}/utils:${_bt_tests_plugins_path}/text:${_bt_tests_plugins_path}/lttng-utils" fi export BT_TESTS_BABELTRACE_PLUGIN_PATH @@ -156,7 +163,7 @@ export BT_TESTS_PYTHON_BIN # # This doesn't need to be exported, but it needs to remain set for # run_python() to use it. -BT_TESTS_PYTHON_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 if [ -z "${BT_TESTS_PYTHON_CONFIG_BIN:-}" ]; then @@ -177,10 +184,12 @@ fi export BT_TESTS_CC_BIN # Whether or not to enable AddressSanitizer, `0` (disabled) if not set. +# +# This doesn't need to be exported from the point of view of this file, +# but the sourced `env.sh` above does export it. if [ -z "${BT_TESTS_ENABLE_ASAN:-}" ]; then BT_TESTS_ENABLE_ASAN="0" fi -export BT_TESTS_ENABLE_ASAN # Directory containing test data BT_TESTS_DATADIR="${BT_TESTS_SRCDIR}/data" @@ -218,10 +227,10 @@ bt_remove_cr_inline() { # # Returns the exit status of the executed `$BT_TESTS_BT2_BIN`. bt_cli() { - local stdout_file="$1" - local stderr_file="$2" + local -r stdout_file="$1" + local -r stderr_file="$2" shift 2 - local args=("$@") + local -r args=("$@") echo "Running: $BT_TESTS_BT2_BIN ${args[*]}" >&2 run_python_bt2 "$BT_TESTS_BT2_BIN" "${args[@]}" 1>"$stdout_file" 2>"$stderr_file" @@ -238,8 +247,8 @@ bt_cli() { # # Returns 0 if there's no difference, or not zero otherwise. bt_diff() { - local expected_file="$1" - local actual_file="$2" + local -r expected_file="$1" + local -r actual_file="$2" local ret=0 diff -u <(bt_remove_cr_inline "$expected_file") <(bt_remove_cr_inline "$actual_file") 1>&2 @@ -388,7 +397,7 @@ check_coverage() { run_python() { local our_pythonpath="${BT_TESTS_SRCDIR}/utils/python" - if [[ $BT_TESTS_PYTHON_VERSION =~ 3.[45] ]]; then + if [[ $_bt_tests_py3_version =~ 3.[45] ]]; then # Add a local directory containing a `typing.py` to `PYTHONPATH` # for Python 3.4 and Python 3.5 which either don't offer the # `typing` module at all, or offer a partial one. @@ -402,12 +411,11 @@ run_python() { # Python modules (in `tests/utils/python`) and the `bt2` Python package. run_python_bt2() { local lib_asan - local -x "BABELTRACE_PYTHON_BT2_NO_TRACEBACK=1" 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}" local -x "BT_CTF_TRACES_PATH=${BT_CTF_TRACES_PATH}" - local -x "BT_PLUGINS_PATH=${BT_PLUGINS_PATH}" + 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" @@ -428,7 +436,7 @@ run_python_bt2() { 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 @@ -440,8 +448,8 @@ run_python_bt2() { # 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 - 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 + lib_asan="$("${BT_TESTS_CC_BIN}" -print-file-name=libasan.so)" local -x LD_PRELOAD="${lib_asan}${LD_PRELOAD:+:}${LD_PRELOAD:-}" fi