X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=tests%2Futils%2Futils.sh;h=49750128f677651722093609907fb449cef1bc14;hb=568f4bd1cdb5bbc78f05df98d0b0a36b7da31b93;hp=1d49b05a6ba2060488e044a764848ffea69338cd;hpb=163f39d1a8ff2505c4349f1834dc289158daee54;p=babeltrace.git

diff --git a/tests/utils/utils.sh b/tests/utils/utils.sh
index 1d49b05a..49750128 100644
--- a/tests/utils/utils.sh
+++ b/tests/utils/utils.sh
@@ -232,7 +232,7 @@ bt_cli() {
 	shift 2
 	local -r args=("$@")
 
-	echo "Running: $BT_TESTS_BT2_BIN ${args[*]}" >&2
+	echo "Running: \`$BT_TESTS_BT2_BIN ${args[*]}\`" >&2
 	run_python_bt2 "$BT_TESTS_BT2_BIN" "${args[@]}" 1>"$stdout_file" 2>"$stderr_file"
 }
 
@@ -249,11 +249,8 @@ bt_cli() {
 bt_diff() {
 	local -r expected_file="$1"
 	local -r actual_file="$2"
-	local ret=0
 
 	diff -u <(bt_remove_cr_inline "$expected_file") <(bt_remove_cr_inline "$actual_file") 1>&2
-
-	return $?
 }
 
 # Checks the difference between:
@@ -280,7 +277,6 @@ bt_diff_cli() {
 
 	local -r temp_stdout_output_file="$(mktemp -t actual-stdout.XXXXXX)"
 	local -r temp_stderr_output_file="$(mktemp -t actual-stderr.XXXXXX)"
-	local ret=0
 
 	bt_cli "$temp_stdout_output_file" "$temp_stderr_output_file" "${args[@]}"
 
@@ -289,13 +285,9 @@ bt_diff_cli() {
 	bt_diff "$expected_stderr_file" "$temp_stderr_output_file" "${args[@]}"
 	local -r ret_stderr=$?
 
-	if ((ret_stdout != 0 || ret_stderr != 0)); then
-		ret=1
-	fi
-
 	rm -f "$temp_stdout_output_file" "$temp_stderr_output_file"
 
-	return $ret
+	return $((ret_stdout || ret_stderr))
 }
 
 # Checks the difference between:
@@ -316,10 +308,9 @@ bt_diff_details_ctf_single() {
 	local -r trace_dir="$2"
 	shift 2
 	local -r extra_details_args=("$@")
-	expected_stderr_file="/dev/null"
 
 	# Compare using the CLI with `sink.text.details`
-	bt_diff_cli "$expected_stdout_file" "$expected_stderr_file" "$trace_dir" \
+	bt_diff_cli "$expected_stdout_file" /dev/null "$trace_dir" \
 		"-c" "sink.text.details" "${extra_details_args[@]+${extra_details_args[@]}}"
 }
 
@@ -338,7 +329,7 @@ bt_diff_details_ctf_gen_single() {
 
 	# Run the CTF trace generator program to get a CTF trace
 	if ! "$ctf_gen_prog_path" "$temp_trace_dir" 2>/dev/null; then
-		echo "ERROR: \"$ctf_gen_prog_path\" \"$temp_trace_dir\" failed" >&2
+		echo "ERROR: \`$ctf_gen_prog_path $temp_trace_dir\` failed" >&2
 		rm -rf "$temp_trace_dir"
 		return 1
 	fi
@@ -457,16 +448,10 @@ run_python_bt2() {
 # the testing Python modules (in `tests/utils/python`) and the `bt2`
 # Python package.
 run_python_bt2_test() {
-	local test_dir="$1"
-	local test_pattern="${2:-'*'}"
+	local -r test_dir="$1"
+	local -r test_pattern="${2:-'*'}"
 
-	local ret
-	local test_runner_args=()
-
-	test_runner_args+=("$test_dir")
-	if [ -n "${test_pattern}" ]; then
-		test_runner_args+=("${test_pattern}")
-	fi
+	local python_exec
 
 	if test "${BT_TESTS_COVERAGE:-}" = "1"; then
 		python_exec="check_coverage"
@@ -480,7 +465,7 @@ run_python_bt2_test() {
 		--pattern "$test_pattern" \
 		"$test_dir" \
 
-	ret=$?
+	local -r ret=$?
 
 	if test "${BT_TESTS_COVERAGE_REPORT:-}" = "1"; then
 		coverage report -m
@@ -496,10 +481,10 @@ run_python_bt2_test() {
 # Generates a CTF trace into the directory `$2` from the moultipart
 # document `$1` using `mctf.py`.
 gen_mctf_trace() {
-	local input_file="$1"
-	local base_dir="$2"
+	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}"
+	diag "Running: \`${BT_TESTS_PYTHON_BIN} ${BT_TESTS_SRCDIR}/utils/python/mctf.py --base-dir ${base_dir} ${input_file}\`"
 	run_python "${BT_TESTS_PYTHON_BIN}" "${BT_TESTS_SRCDIR}/utils/python/mctf.py" \
 		--base-dir "${base_dir}" "${input_file}"
 }