From 6586085673db2e2d7e66652855d449b4abaab467 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=BD=D0=B0=D0=B1?= <nabijaczleweli@nabijaczleweli.xyz>
Date: Wed, 23 Mar 2022 17:54:07 +0100
Subject: [PATCH] tests: include: math: simplify bc conditions, review $?
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: John Kennedy <john.kennedy@delphix.com>
Reviewed-by: Ryan Moeller <ryan@iXsystems.com>
Signed-off-by: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz>
Closes #13259
---
 tests/zfs-tests/include/math.shlib | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/tests/zfs-tests/include/math.shlib b/tests/zfs-tests/include/math.shlib
index 7ac59f2796..38d9fecea7 100644
--- a/tests/zfs-tests/include/math.shlib
+++ b/tests/zfs-tests/include/math.shlib
@@ -30,17 +30,14 @@ function within_percent
 	typeset percent=$3
 
 	# Set $a or $b to $2 such that a >= b
-	[[ '1' = $(echo "if ($2 > $a) 1 else 0" | bc) ]] && a=$2 || b=$2
+	[ 1 -eq $(echo "$2 > $a" | bc) ] && a=$2 || b=$2
 
 	# Prevent division by 0
 	[[ $a =~ [1-9] ]] || return 1
 
 	typeset p=$(echo "scale=2; $b * 100 / $a" | bc)
 	log_note "Comparing $a and $b given $percent% (calculated: $p%)"
-	[[ '1' = $(echo "scale=2; if ($p >= $percent) 1 else 0" | bc) ]] && \
-	    return 0
-
-	return 1
+	[ 1 -eq $(echo "scale=2; $p >= $percent" | bc) ]
 }
 
 #
@@ -61,9 +58,7 @@ function within_tolerance #value #target #tolerance
 
 	typeset diff=$((abs(val - target)))
 	log_note "Checking if $val is within +/-$tol of $target (diff: $diff)"
-	((diff <= tol)) && return 0
-
-	return 1
+	((diff <= tol))
 }
 
 #