From: Michael Jeanson <mjeanson@efficios.com>
Date: Mon, 2 Oct 2017 17:11:42 +0000 (-0400)
Subject: Port: fix library load in python tests on Windows
X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=commitdiff_plain;h=466c8b1539c70d738a0fec74ec45fbe5abd1bcf7

Port: fix library load in python tests on Windows

On Windows, the PATH variable is used to load library dependencies at runtime.

Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
---

diff --git a/tests/bindings/python/babeltrace/test_python_babeltrace.in b/tests/bindings/python/babeltrace/test_python_babeltrace.in
index 0e9d8a9b..4e2e9da5 100644
--- a/tests/bindings/python/babeltrace/test_python_babeltrace.in
+++ b/tests/bindings/python/babeltrace/test_python_babeltrace.in
@@ -28,7 +28,6 @@ check_coverage() {
 export BABELTRACE_PYTHON_BT2_NO_TRACEBACK=1
 export TEST_PLUGIN_PLUGINS_PATH="${BT_BUILD_PATH}/plugins"
 export BABELTRACE_PLUGIN_PATH="${BT_BUILD_PATH}/plugins/ctf:${BT_BUILD_PATH}/plugins/utils:${BT_BUILD_PATH}/plugins/text"
-export LD_LIBRARY_PATH="${BT_BUILD_PATH}/lib/.libs"
 export TEST_CTF_TRACES_PATH="${BT_SRC_PATH}/tests/ctf-traces"
 PYTHON_BUILD_DIR="${BT_BUILD_PATH}/bindings/python/bt2/build/build_lib:${BT_BUILD_PATH}/bindings/python/babeltrace/build/build_lib"
 TESTS_UTILS_PYTHON_DIR="${BT_SRC_PATH}/tests/utils/python"
@@ -36,22 +35,28 @@ TESTS_CTF_TRACES="${BT_SRC_PATH}/tests/ctf-traces"
 TESTRUNNER_PY="${BT_SRC_PATH}/tests/utils/python/testrunner.py"
 THIS_DIR="${BT_SRC_PATH}/tests/bindings/python/babeltrace"
 
-if test "x$TESTALL_COVERAGE" = "x1"; then
+if [ "x${MSYSTEM}" != "x" ]; then
+	export PATH="${BT_BUILD_PATH}/lib/.libs:${PATH}"
+else
+	export LD_LIBRARY_PATH="${BT_BUILD_PATH}/lib/.libs:${LD_LIBRARY_PATH}"
+fi
+
+if test "x${TESTALL_COVERAGE}" = "x1"; then
 	EXEC=check_coverage
 else
 	EXEC="@PYTHON@"
 
 fi
 
-PYTHONPATH="$PYTHON_BUILD_DIR:$TESTS_UTILS_PYTHON_DIR" \
-	"$EXEC" "$TESTRUNNER_PY" "$THIS_DIR"
+PYTHONPATH="${PYTHON_BUILD_DIR}:${TESTS_UTILS_PYTHON_DIR}" \
+	"${EXEC}" "${TESTRUNNER_PY}" "${THIS_DIR}"
 res=$?
 
-if test "x$TESTALL_COVERAGE_REPORT" = "x1"; then
+if test "x${TESTALL_COVERAGE_REPORT}" = "x1"; then
 	coverage report -m
 fi
 
-if test "x$TESTALL_COVERAGE_HTML" = "x1"; then
+if test "x${TESTALL_COVERAGE_HTML}" = "x1"; then
 	coverage html
 fi
 
diff --git a/tests/bindings/python/bt2/test_python_bt2.in b/tests/bindings/python/bt2/test_python_bt2.in
index 37ea95ec..d627714f 100644
--- a/tests/bindings/python/bt2/test_python_bt2.in
+++ b/tests/bindings/python/bt2/test_python_bt2.in
@@ -27,29 +27,34 @@ check_coverage() {
 export BABELTRACE_PYTHON_BT2_NO_TRACEBACK=1
 export TEST_PLUGIN_PLUGINS_PATH="${BT_BUILD_PATH}/plugins"
 export BABELTRACE_PLUGIN_PATH="${BT_BUILD_PATH}/plugins/ctf:${BT_BUILD_PATH}/plugins/utils:${BT_BUILD_PATH}/plugins/text"
-export LD_LIBRARY_PATH="${BT_BUILD_PATH}/lib/.libs"
 export TEST_CTF_TRACES_PATH="${BT_SRC_PATH}/tests/ctf-traces"
 PYTHON_BUILD_DIR="${BT_BUILD_PATH}/bindings/python/bt2/build/build_lib"
 TESTS_UTILS_PYTHON_DIR="${BT_SRC_PATH}/tests/utils/python"
 TESTRUNNER_PY="${BT_SRC_PATH}/tests/utils/python/testrunner.py"
 THIS_DIR="${BT_SRC_PATH}/tests/bindings/python/bt2"
 
-if test "x$TESTALL_COVERAGE" = "x1"; then
+if [ "x${MSYSTEM}" != "x" ]; then
+	export PATH="${BT_BUILD_PATH}/lib/.libs:${PATH}"
+else
+	export LD_LIBRARY_PATH="${BT_BUILD_PATH}/lib/.libs:${LD_LIBRARY_PATH}"
+fi
+
+if test "x${TESTALL_COVERAGE}" = "x1"; then
 	EXEC=check_coverage
 else
 	EXEC="@PYTHON@"
 
 fi
 
-PYTHONPATH="$PYTHON_BUILD_DIR:$TESTS_UTILS_PYTHON_DIR" \
-	"$EXEC" "$TESTRUNNER_PY" "$THIS_DIR"
+PYTHONPATH="${PYTHON_BUILD_DIR}:${TESTS_UTILS_PYTHON_DIR}" \
+	"${EXEC}" "${TESTRUNNER_PY}" "${THIS_DIR}"
 res=$?
 
-if test "x$TESTALL_COVERAGE_REPORT" = "x1"; then
+if test "x${TESTALL_COVERAGE_REPORT}" = "x1"; then
 	coverage report -m
 fi
 
-if test "x$TESTALL_COVERAGE_HTML" = "x1"; then
+if test "x${TESTALL_COVERAGE_HTML}" = "x1"; then
 	coverage html
 fi
 
diff --git a/tests/python-plugin-provider/test_python_plugin_provider.in b/tests/python-plugin-provider/test_python_plugin_provider.in
index 9156786b..6f80f984 100644
--- a/tests/python-plugin-provider/test_python_plugin_provider.in
+++ b/tests/python-plugin-provider/test_python_plugin_provider.in
@@ -21,12 +21,18 @@ NO_SH_TAP=1
 . "@abs_top_builddir@/tests/utils/common.sh"
 
 export PYTHON_PLUGIN_PROVIDER_TEST_PLUGIN_PATH="${BT_SRC_PATH}/tests/python-plugin-provider/bt_plugin_test_python_plugin_provider.py"
-export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${BT_BUILD_PATH}/lib/.libs:${BT_BUILD_PATH}/python-plugin-provider/.libs"
+
 PYTHON_BUILD_DIR="${BT_BUILD_PATH}/bindings/python/bt2/build/build_lib"
 TESTS_UTILS_PYTHON_DIR="${BT_SRC_PATH}/tests/utils/python"
 TESTRUNNER_PY="${BT_SRC_PATH}/tests/utils/python/testrunner.py"
 THIS_DIR="${BT_SRC_PATH}/tests/python-plugin-provider"
 
+if [ "x${MSYSTEM}" != "x" ]; then
+	export PATH="${BT_BUILD_PATH}/lib/.libs:${BT_BUILD_PATH}/python-plugin-provider/.libs:${PATH}"
+else
+	export LD_LIBRARY_PATH="${BT_BUILD_PATH}/lib/.libs:${BT_BUILD_PATH}/python-plugin-provider/.libs:${LD_LIBRARY_PATH}"
+fi
+
 PYTHONPATH="${PYTHON_BUILD_DIR}:${TESTS_UTILS_PYTHON_DIR}" \
 	"@PYTHON@" "${TESTRUNNER_PY}" "${THIS_DIR}"
 exit $?