X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=tests%2Fbindings%2Fpython%2Fbabeltrace%2Ftest_python_babeltrace.in;h=4e2e9da51c56b851f20405e5ae50f29dddcb3207;hb=93fb46c635574cad6ae2e5de0727ac9835b74438;hp=fec9e033edf54fea7655d089821ea49f580b13be;hpb=b016b06b258cde220c44ec5f32093996868c382f;p=babeltrace.git

diff --git a/tests/bindings/python/babeltrace/test_python_babeltrace.in b/tests/bindings/python/babeltrace/test_python_babeltrace.in
index fec9e033..4e2e9da5 100644
--- a/tests/bindings/python/babeltrace/test_python_babeltrace.in
+++ b/tests/bindings/python/babeltrace/test_python_babeltrace.in
@@ -28,29 +28,35 @@ 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"
 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