X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=tests%2Futils%2Futils.sh;h=b568590affd9f69a9ed615a42aba525d79025a9c;hb=0824c914aaf637dfd534fedd612d15f6d7ea001a;hp=a068ccb5c6ecc340a22c29d7af6588e3a10d0fb5;hpb=07ff3b19ad76e1c2c7e18c244fd9adb84b09a82f;p=babeltrace.git

diff --git a/tests/utils/utils.sh b/tests/utils/utils.sh
index a068ccb5..b568590a 100644
--- a/tests/utils/utils.sh
+++ b/tests/utils/utils.sh
@@ -25,15 +25,6 @@
 # An unbound variable is an error
 set -u
 
-# If `readlink -f` is available, then get a resolved absolute path to
-# the tests source directory. Otherwise, make do with a relative path.
-scriptdir="$(dirname "${BASH_SOURCE[0]}")"
-if readlink -f "." >/dev/null 2>&1; then
-	testsdir=$(readlink -f "$scriptdir/..")
-else
-	testsdir="$scriptdir/.."
-fi
-
 # Name of the OS on which we're running, if not set.
 #
 # One of:
@@ -71,24 +62,51 @@ if [ -z "${BT_TESTS_OS_TYPE:-}" ]; then
 fi
 export BT_TESTS_OS_TYPE
 
-# Base source directory of tests
-if [ -z "${BT_TESTS_SRCDIR:-}" ]; then
-	BT_TESTS_SRCDIR="$testsdir"
-fi
-export BT_TESTS_SRCDIR
+# Sets and exports, if not set:
+#
+# • `BT_TESTS_SRCDIR` to the base source directory of tests.
+# • `BT_TESTS_BUILDDIR` to the base build directory of tests.
+_set_vars_srcdir_builddir() {
+	# If `readlink -f` is available, then get a resolved absolute path
+	# to the tests source directory. Otherwise, make do with a relative
+	# path.
+	local -r scriptdir="$(dirname "${BASH_SOURCE[0]}")"
+	local testsdir
 
-# Base build directory of tests
-if [ -z "${BT_TESTS_BUILDDIR:-}" ]; then
-	BT_TESTS_BUILDDIR="$testsdir"
-fi
-export BT_TESTS_BUILDDIR
+	if readlink -f "." >/dev/null 2>&1; then
+		testsdir=$(readlink -f "$scriptdir/..")
+	else
+		testsdir="$scriptdir/.."
+	fi
 
+	# Base source directory of tests
+	if [ -z "${BT_TESTS_SRCDIR:-}" ]; then
+		BT_TESTS_SRCDIR="$testsdir"
+	fi
+	export BT_TESTS_SRCDIR
 
-# 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
+	# Base build directory of tests
+	if [ -z "${BT_TESTS_BUILDDIR:-}" ]; then
+		BT_TESTS_BUILDDIR="$testsdir"
+	fi
+	export BT_TESTS_BUILDDIR
+}
+
+_set_vars_srcdir_builddir
+unset -f _set_vars_srcdir_builddir
+
+# 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
@@ -103,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
 
@@ -145,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
@@ -166,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"
@@ -207,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"
@@ -377,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.
@@ -391,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"
@@ -417,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
@@ -429,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