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

diff --git a/tests/utils/utils.sh b/tests/utils/utils.sh
index 28361a63..49750128 100644
--- a/tests/utils/utils.sh
+++ b/tests/utils/utils.sh
@@ -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[@]}}"
 }