From: Philippe Proulx <eeppeliteloop@gmail.com>
Date: Fri, 10 Nov 2023 04:24:43 +0000 (-0500)
Subject: tests/utils/utils.sh: bt_diff_cli(): return directly, don't use `ret`
X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=commitdiff_plain;h=a5102ddb88291f042ac054bdc1acafb21d8344e7

tests/utils/utils.sh: bt_diff_cli(): return directly, don't use `ret`

Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
Change-Id: I60257da865052146ca3b1bb3b10bcea02f4ff1d2
---

diff --git a/tests/utils/utils.sh b/tests/utils/utils.sh
index 739ec225..af500b96 100644
--- a/tests/utils/utils.sh
+++ b/tests/utils/utils.sh
@@ -277,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[@]}"
 
@@ -286,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: