From: Zdenek Kabelac <zkabelac@redhat.com>
Date: Thu, 29 Jun 2017 08:19:32 +0000 (+0200)
Subject: tests: utils.sh arithmetic
X-Git-Tag: v2_02_173~161
X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=4697937af46f2c95b29c627ef60ec37ba1addcf8;p=lvm2.git

tests: utils.sh arithmetic

expr is antiquated. Consider rewriting this using $((..)), ${} or [[ ]].
$ is unnecessary on arithmetic variables.
---

diff --git a/test/lib/utils.sh b/test/lib/utils.sh
index fa072ba18..6a4664933 100644
--- a/test/lib/utils.sh
+++ b/test/lib/utils.sh
@@ -97,7 +97,7 @@ mkdtemp() {
 		err=$(mkdir -m 0700 "$candidate_dir" 2>&1) && \
 			{ echo "$candidate_dir"; return; }
 		test $MAX_TRIES -le $i && break;
-		i=$(expr $i + 1)
+		i=$(( i + 1 ))
 	done
 	die "$err"
 }
@@ -114,7 +114,7 @@ stacktrace() {
 	echo "## - $0:${BASH_LINENO[0]}"
 	while FUNC=${FUNCNAME[$i]}; test "$FUNC" != "main"; do
 		echo "## $i ${FUNC}() called from ${BASH_SOURCE[$i]}:${BASH_LINENO[$i]}"
-		i=$(($i + 1))
+		i=$(( i + 1 ))
 	done
 }
 
@@ -150,7 +150,7 @@ STACKTRACE() {
 			test -f "$i" || break  # nothing is found (expands to debug.log*)
 			name=${i##debug.log_}
 			name=${name%%_*}
-			test "$name" = "DEBUG" && { name="$name$idx" ; idx=$(($idx + 1)) ; }
+			test "$name" = "DEBUG" && { name="$name$idx" ; idx=$(( idx + 1 )) ; }
 			echo "<======== Debug log $i ========>"
 			sed -e "s,^,## $name: ," "$i"
 		done