X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=tests%2Futils%2Futils.sh;h=896f2a0f29d4aeea42b42b4419520115321b262f;hb=9c5dd55ab776adbdfe69dcad62765c937e0a52e7;hp=27a5f3ee903e4fd85d165a151fcf3955ab58383c;hpb=58db335ee64dfdedc0e351fd8e1524e7ca381896;p=babeltrace.git

diff --git a/tests/utils/utils.sh b/tests/utils/utils.sh
index 27a5f3ee..896f2a0f 100644
--- a/tests/utils/utils.sh
+++ b/tests/utils/utils.sh
@@ -22,7 +22,14 @@
 # Error out when encountering an undefined variable
 set -u
 
+# If "readlink -f" is available, get a resolved absolute path to the
+# tests source dir, 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
 
 # The OS on which we are running. See [1] for possible values of 'uname -s'.
 # We do a bit of translation to ease our life down the road for comparison.
@@ -52,12 +59,12 @@ export BT_OS_TYPE
 
 # Allow overriding the source and build directories
 if [ "x${BT_TESTS_SRCDIR:-}" = "x" ]; then
-	BT_TESTS_SRCDIR="$scriptdir/.."
+	BT_TESTS_SRCDIR="$testsdir"
 fi
 export BT_TESTS_SRCDIR
 
 if [ "x${BT_TESTS_BUILDDIR:-}" = "x" ]; then
-	BT_TESTS_BUILDDIR="$scriptdir/.."
+	BT_TESTS_BUILDDIR="$testsdir"
 fi
 export BT_TESTS_BUILDDIR
 
@@ -120,6 +127,11 @@ if [ "x${BT_TESTS_PYTHON_BIN:-}" = "x" ]; then
 fi
 export BT_TESTS_PYTHON_BIN
 
+if [ "x${BT_TESTS_PYTHON_CONFIG_BIN:-}" = "x" ]; then
+	BT_TESTS_PYTHON_CONFIG_BIN="python3-config"
+fi
+export BT_TESTS_PYTHON_BIN
+
 if [ "x${BT_TESTS_SED_BIN:-}" = "x" ]; then
 	BT_TESTS_SED_BIN="sed"
 fi
@@ -129,7 +141,6 @@ export BT_TESTS_SED_BIN
 # Data files path
 BT_TESTS_DATADIR="${BT_TESTS_SRCDIR}/data"
 BT_CTF_TRACES_PATH="${BT_TESTS_DATADIR}/ctf-traces"
-BT_DEBUG_INFO_PATH="${BT_TESTS_DATADIR}/debug-info"
 
 
 ### Diff Functions ###
@@ -248,32 +259,36 @@ check_coverage() {
 # Execute a shell command in the appropriate environment to have access to the
 # bt2 Python bindings.
 run_python_bt2() {
-	local lib_search_var
-	local lib_search_path
+	local env_args
+
+	env_args=(
+		"BABELTRACE_PYTHON_BT2_NO_TRACEBACK=1" \
+		"BABELTRACE_PLUGIN_PATH=${BT_TESTS_BABELTRACE_PLUGIN_PATH}" \
+		"LIBBABELTRACE2_PLUGIN_PROVIDER_DIR=${BT_TESTS_PROVIDER_DIR}" \
+		"BT_CTF_TRACES_PATH=${BT_CTF_TRACES_PATH}" \
+		"BT_PLUGINS_PATH=${BT_PLUGINS_PATH}" \
+		"PYTHONPATH=${BT_TESTS_PYTHONPATH}:${BT_TESTS_SRCDIR}/utils/python"
+		)
 
 	local main_lib_path="${BT_TESTS_BUILDDIR}/../src/lib/.libs"
 
 	# Set the library search path so the python interpreter can load libbabeltrace2
 	if [ "$BT_OS_TYPE" = "mingw" ] || [ "$BT_OS_TYPE" = "cygwin" ]; then
-		lib_search_var="PATH"
-		lib_search_path="${main_lib_path}:${PATH:-}"
+		env_args+=("PATH=${main_lib_path}:${PATH:-}")
 	elif [ "$BT_OS_TYPE" = "darwin" ]; then
-		lib_search_var="DYLD_LIBRARY_PATH"
-		lib_search_path="${main_lib_path}:${DYLD_LIBRARY_PATH:-}"
+		env_args+=("DYLD_LIBRARY_PATH=${main_lib_path}:${DYLD_LIBRARY_PATH:-}")
 	else
-		lib_search_var="LD_LIBRARY_PATH"
-		lib_search_path="${main_lib_path}:${LD_LIBRARY_PATH:-}"
+		env_args+=("LD_LIBRARY_PATH=${main_lib_path}:${LD_LIBRARY_PATH:-}")
+	fi
+
+	# On Windows, an embedded Python interpreter needs a way to locate the path
+	# to it's internal modules, set the prefix from python-config to the
+	# PYTHONHOME variable.
+	if [ "$BT_OS_TYPE" = "mingw" ]; then
+		env_args+=("PYTHONHOME=$($BT_TESTS_PYTHON_CONFIG_BIN --prefix)")
 	fi
 
-	env \
-		BABELTRACE_PYTHON_BT2_NO_TRACEBACK=1 \
-		BABELTRACE_PLUGIN_PATH="${BT_TESTS_BABELTRACE_PLUGIN_PATH}" \
-		LIBBABELTRACE2_PLUGIN_PROVIDER_DIR=${BT_TESTS_PROVIDER_DIR} \
-		BT_CTF_TRACES_PATH="${BT_CTF_TRACES_PATH}" \
-		BT_PLUGINS_PATH="${BT_PLUGINS_PATH}" \
-		PYTHONPATH="${BT_TESTS_PYTHONPATH}:${BT_TESTS_SRCDIR}/utils/python" \
-		"${lib_search_var}"="${lib_search_path}" \
-		"$@"
+	env "${env_args[@]}" "$@"
 }
 
 # Set the environment and run python tests in the directory.