From 4697937af46f2c95b29c627ef60ec37ba1addcf8 Mon Sep 17 00:00:00 2001 From: Zdenek Kabelac Date: Thu, 29 Jun 2017 10:19:32 +0200 Subject: [PATCH] tests: utils.sh arithmetic expr is antiquated. Consider rewriting this using $((..)), ${} or [[ ]]. $ is unnecessary on arithmetic variables. --- test/lib/utils.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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