X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=tests%2Futils%2Futils.sh;h=d6d061846f3b53a3a8a8b75b30cc08909f98c328;hb=6640a05fe68f4c32cfd90236c90890e9b01c0359;hp=3b2ee8886877f55f0429ad20dc541311da074166;hpb=53be3c125109c38ed1acb7d94798d2314237e4c7;p=babeltrace.git

diff --git a/tests/utils/utils.sh b/tests/utils/utils.sh
index 3b2ee888..d6d06184 100644
--- a/tests/utils/utils.sh
+++ b/tests/utils/utils.sh
@@ -112,7 +112,7 @@ unset -f _source_env_sh
 if [ -z "${BT_TESTS_BT2_BIN:-}" ]; then
 	BT_TESTS_BT2_BIN="$BT_TESTS_BUILDDIR/../src/cli/babeltrace2"
 	if [ "$BT_TESTS_OS_TYPE" = "mingw" ]; then
-		BT_TESTS_BT2_BIN="${BT_TESTS_BT2_BIN}.exe"
+		BT_TESTS_BT2_BIN+=".exe"
 	fi
 fi
 export BT_TESTS_BT2_BIN
@@ -374,7 +374,7 @@ if [[ ${SH_TAP:-} == 1 ]]; then
 fi
 
 # Forwards the arguments to `coverage run`.
-check_coverage() {
+_bt_tests_check_coverage() {
 	coverage run "$@"
 }
 
@@ -457,7 +457,7 @@ run_python_bt2_test() {
 	local python_exec
 
 	if test "${BT_TESTS_COVERAGE:-}" = "1"; then
-		python_exec="check_coverage"
+		python_exec="_bt_tests_check_coverage"
 	else
 		python_exec="${BT_TESTS_PYTHON_BIN}"
 	fi
@@ -487,7 +487,7 @@ gen_mctf_trace() {
 	local -r input_file="$1"
 	local -r base_dir="$2"
 
-	diag "Running: \`${BT_TESTS_PYTHON_BIN} ${BT_TESTS_SRCDIR}/utils/python/mctf.py --base-dir ${base_dir} ${input_file}\`"
+	echo "Running: \`${BT_TESTS_PYTHON_BIN} ${BT_TESTS_SRCDIR}/utils/python/mctf.py --base-dir ${base_dir} ${input_file}\`" >&2
 	run_python "${BT_TESTS_PYTHON_BIN}" "${BT_TESTS_SRCDIR}/utils/python/mctf.py" \
 		--base-dir "${base_dir}" "${input_file}"
 }