X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=tests%2Futils%2Futils.sh;h=e2b730923685828301a158ecbba35a19e3fc1402;hb=ecd7492f21a492b70569d5ecc1d3a808241b63f0;hp=8bf9df896509c3a6a7998174ed9da8f4b1d56fe2;hpb=717a01a712b427130c6ebb23940e65addb6ed65a;p=babeltrace.git

diff --git a/tests/utils/utils.sh b/tests/utils/utils.sh
index 8bf9df89..e2b73092 100644
--- a/tests/utils/utils.sh
+++ b/tests/utils/utils.sh
@@ -228,8 +228,8 @@ bt_diff_cli() {
 	local ret_stdout
 	local ret_stderr
 
-	temp_stdout_output_file="$(mktemp -t actual_stdout.XXXXXX)"
-	temp_stderr_output_file="$(mktemp -t actual_stderr.XXXXXX)"
+	temp_stdout_output_file="$(mktemp -t actual-stdout.XXXXXX)"
+	temp_stderr_output_file="$(mktemp -t actual-stderr.XXXXXX)"
 
 	# Run the CLI to get a detailed file.
 	bt_cli "$temp_stdout_output_file" "$temp_stderr_output_file" "${args[@]}"
@@ -309,7 +309,7 @@ check_coverage() {
 run_python() {
 	local our_pythonpath="${BT_TESTS_SRCDIR}/utils/python"
 
-	if [[ $BT_TESTS_PYTHON_VERSION = 3.4 ]]; then
+	if [[ $BT_TESTS_PYTHON_VERSION =~ 3.[45] ]]; then
 		# Add a local directory containing a `typing.py` to `PYTHONPATH` for
 		# Python 3.4 which doesn't offer the `typing` module.
 		our_pythonpath="$our_pythonpath:${BT_TESTS_SRCDIR}/utils/python/typing"
@@ -419,6 +419,6 @@ gen_mctf_trace() {
 	local base_dir="$2"
 
 	diag "Running: ${BT_TESTS_PYTHON_BIN} ${BT_TESTS_SRCDIR}/utils/python/mctf.py --base-dir ${base_dir} ${input_file}"
-	"${BT_TESTS_PYTHON_BIN}" "${BT_TESTS_SRCDIR}/utils/python/mctf.py" \
+	run_python "${BT_TESTS_PYTHON_BIN}" "${BT_TESTS_SRCDIR}/utils/python/mctf.py" \
 		--base-dir "${base_dir}" "${input_file}"
 }