Replace expr's with $((expression)) shell constucts

Also make indenting consistent.

(cherry picked from commit 669c42cd950da295bbfc47c93c97931b3b46344e)

diff --git a/bin/tests/system/rrsetorder/tests.sh b/bin/tests/system/rrsetorder/tests.sh
index 01a40fb34b6da2a87a4ad33b4feace92c7ed7f7b..d9dedc3cff8383b80fe531c9f4c09036393e0501 100644 (file)
--- a/bin/tests/system/rrsetorder/tests.sh
+++ b/bin/tests/system/rrsetorder/tests.sh
@@ -41,20 +41,20 @@ if $test_fixed; then
     $DIFF dig.out.fixed dig.out.fixed.good >/dev/null || ret=1
     done
     if [ $ret != 0 ]; then echo_i "failed"; fi
-    status=`expr $status + $ret`
+    status=$((status + ret))
 else
     echo_i "Checking order fixed behaves as cyclic when disabled (primary)"
     ret=0
     matches=0
     for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20
     do
-        j=`expr $i % 4`
+       j=$((i % 4))
        $DIGCMD @10.53.0.1 fixed.example > dig.out.fixed  || ret=1
-        if [ $i -le 4 ]; then
-            cp dig.out.fixed dig.out.$j
-        else
-            $DIFF dig.out.fixed dig.out.$j >/dev/null && matches=`expr $matches + 1`
-        fi
+       if [ $i -le 4 ]; then
+           cp dig.out.fixed dig.out.$j
+       else
+           $DIFF dig.out.fixed dig.out.$j >/dev/null && matches=$((matches + 1))
+       fi
     done
     $DIFF dig.out.0 dig.out.1 >/dev/null && ret=1
     $DIFF dig.out.0 dig.out.2 >/dev/null && ret=1
@@ -64,7 +64,7 @@ else
     $DIFF dig.out.2 dig.out.3 >/dev/null && ret=1
     if [ $matches -ne 16 ]; then ret=1; fi
     if [ $ret != 0 ]; then echo_i "failed"; fi
-    status=`expr $status + $ret`
+    status=$((status + ret))
 fi
 
 #
@@ -75,12 +75,12 @@ ret=0
 matches=0
 for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20
 do
-    j=`expr $i % 4`
+    j=$((i % 4))
     $DIGCMD @10.53.0.1 cyclic.example > dig.out.cyclic || ret=1
     if [ $i -le 4 ]; then
-        cp dig.out.cyclic dig.out.$j
+       cp dig.out.cyclic dig.out.$j
     else
-        $DIFF dig.out.cyclic dig.out.$j >/dev/null && matches=`expr $matches + 1`
+       $DIFF dig.out.cyclic dig.out.$j >/dev/null && matches=$((matches + 1))
     fi
 done
 $DIFF dig.out.0 dig.out.1 >/dev/null && ret=1
@@ -91,7 +91,7 @@ $DIFF dig.out.1 dig.out.3 >/dev/null && ret=1
 $DIFF dig.out.2 dig.out.3 >/dev/null && ret=1
 if [ $matches -ne 16 ]; then ret=1; fi
 if [ $ret != 0 ]; then echo_i "failed"; fi
-status=`expr $status + $ret`
+status=$((status + ret))
 
 #
 #
@@ -101,12 +101,12 @@ ret=0
 matches=0
 for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20
 do
-    j=`expr $i % 4`
+    j=$((i % 4))
     $DIGCMD @10.53.0.1 cyclic2.example > dig.out.cyclic2 || ret=1
     if [ $i -le 4 ]; then
-        cp dig.out.cyclic2 dig.out.$j
+       cp dig.out.cyclic2 dig.out.$j
     else
-        $DIFF dig.out.cyclic2 dig.out.$j >/dev/null && matches=`expr $matches + 1`
+       $DIFF dig.out.cyclic2 dig.out.$j >/dev/null && matches=$((matches + 1))
     fi
 done
 $DIFF dig.out.0 dig.out.1 >/dev/null && ret=1
@@ -117,12 +117,12 @@ $DIFF dig.out.1 dig.out.3 >/dev/null && ret=1
 $DIFF dig.out.2 dig.out.3 >/dev/null && ret=1
 if [ $matches -ne 16 ]; then ret=1; fi
 if [ $ret != 0 ]; then echo_i "failed"; fi
-status=`expr $status + $ret`
+status=$((status + ret))
 echo_i "Checking order random (primary)"
 ret=0
 for i in $GOOD_RANDOM
 do
-       eval match$i=0
+    eval match$i=0
 done
 for i in a b c d e f g h i j k l m n o p q r s t u v w x y z 0 1 2 3 4 5 6 7 9
 do
@@ -138,27 +138,27 @@ done
 match=0
 for i in $GOOD_RANDOM
 do
-       eval "match=\`expr \$match + \$match$i\`"
+     eval "match=\$((match + match$i))"
 done
 echo_i "Random selection return $match of ${GOOD_RANDOM_NO} possible orders in 36 samples"
-if [ $match -lt `expr ${GOOD_RANDOM_NO} / 3` ]; then ret=1; fi
+if [ $match -lt $((GOOD_RANDOM_NO / 3)) ]; then ret=1; fi
 if [ $ret != 0 ]; then echo_i "failed"; fi
-status=`expr $status + $ret`
+status=$((status + ret))
 
 echo_i "Checking order none (primary)"
 ret=0
 # Fetch the "reference" response and ensure it contains the expected records.
 $DIGCMD @10.53.0.1 none.example > dig.out.none || ret=1
 for i in 1 2 3 4; do
-       grep -F -q 1.2.3.$i dig.out.none || ret=1
+    grep -F -q 1.2.3.$i dig.out.none || ret=1
 done
 # Ensure 20 further queries result in the same response as the "reference" one.
 for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20; do
-       $DIGCMD @10.53.0.1 none.example > dig.out.test$i || ret=1
-       $DIFF dig.out.none dig.out.test$i >/dev/null || ret=1
+    $DIGCMD @10.53.0.1 none.example > dig.out.test$i || ret=1
+    $DIFF dig.out.none dig.out.test$i >/dev/null || ret=1
 done
 if [ $ret != 0 ]; then echo_i "failed"; fi
-status=`expr $status + $ret`
+status=$((status + ret))
 
 #
 #
@@ -172,7 +172,7 @@ if $test_fixed; then
     $DIFF dig.out.fixed dig.out.fixed.good || ret=1
     done
     if [ $ret != 0 ]; then echo_i "failed"; fi
-    status=`expr $status + $ret`
+    status=$((status + ret))
 fi
 
 #
@@ -183,12 +183,12 @@ ret=0
 matches=0
 for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20
 do
-    j=`expr $i % 4`
+    j=$((i % 4))
     $DIGCMD @10.53.0.2 cyclic.example > dig.out.cyclic || ret=1
     if [ $i -le 4 ]; then
-        cp dig.out.cyclic dig.out.$j
+       cp dig.out.cyclic dig.out.$j
     else
-        $DIFF dig.out.cyclic dig.out.$j >/dev/null && matches=`expr $matches + 1`
+       $DIFF dig.out.cyclic dig.out.$j >/dev/null && matches=$((matches + 1))
     fi
 done
 $DIFF dig.out.0 dig.out.1 >/dev/null && ret=1
@@ -199,7 +199,7 @@ $DIFF dig.out.1 dig.out.3 >/dev/null && ret=1
 $DIFF dig.out.2 dig.out.3 >/dev/null && ret=1
 if [ $matches -ne 16 ]; then ret=1; fi
 if [ $ret != 0 ]; then echo_i "failed"; fi
-status=`expr $status + $ret`
+status=$((status + ret))
 
 #
 #
@@ -209,12 +209,12 @@ ret=0
 matches=0
 for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20
 do
-    j=`expr $i % 4`
+    j=$((i % 4))
     $DIGCMD @10.53.0.2 cyclic2.example > dig.out.cyclic2 || ret=1
     if [ $i -le 4 ]; then
-        cp dig.out.cyclic2 dig.out.$j
+       cp dig.out.cyclic2 dig.out.$j
     else
-        $DIFF dig.out.cyclic2 dig.out.$j >/dev/null && matches=`expr $matches + 1`
+       $DIFF dig.out.cyclic2 dig.out.$j >/dev/null && matches=$((matches + 1))
     fi
 done
 $DIFF dig.out.0 dig.out.1 >/dev/null && ret=1
@@ -225,13 +225,13 @@ $DIFF dig.out.1 dig.out.3 >/dev/null && ret=1
 $DIFF dig.out.2 dig.out.3 >/dev/null && ret=1
 if [ $matches -ne 16 ]; then ret=1; fi
 if [ $ret != 0 ]; then echo_i "failed"; fi
-status=`expr $status + $ret`
+status=$((status + ret))
 
 echo_i "Checking order random (secondary)"
 ret=0
 for i in $GOOD_RANDOM
 do
-       eval match$i=0
+    eval match$i=0
 done
 for i in a b c d e f g h i j k l m n o p q r s t u v w x y z 0 1 2 3 4 5 6 7 9
 do
@@ -247,27 +247,27 @@ done
 match=0
 for i in $GOOD_RANDOM
 do
-eval "match=\`expr \$match + \$match$i\`"
+     eval "match=\$((match + match$i))"
 done
 echo_i "Random selection return $match of ${GOOD_RANDOM_NO} possible orders in 36 samples"
-if [ $match -lt `expr ${GOOD_RANDOM_NO} / 3` ]; then ret=1; fi
+if [ $match -lt $((GOOD_RANDOM_NO / 3)) ]; then ret=1; fi
 if [ $ret != 0 ]; then echo_i "failed"; fi
-status=`expr $status + $ret`
+status=$((status + ret))
 
 echo_i "Checking order none (secondary)"
 ret=0
 # Fetch the "reference" response and ensure it contains the expected records.
 $DIGCMD @10.53.0.2 none.example > dig.out.none || ret=1
 for i in 1 2 3 4; do
-       grep -F -q 1.2.3.$i dig.out.none || ret=1
+    grep -F -q 1.2.3.$i dig.out.none || ret=1
 done
 # Ensure 20 further queries result in the same response as the "reference" one.
 for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20; do
-       $DIGCMD @10.53.0.2 none.example > dig.out.test$i || ret=1
-       $DIFF dig.out.none dig.out.test$i >/dev/null || ret=1
+    $DIGCMD @10.53.0.2 none.example > dig.out.test$i || ret=1
+    $DIFF dig.out.none dig.out.test$i >/dev/null || ret=1
 done
 if [ $ret != 0 ]; then echo_i "failed"; fi
-status=`expr $status + $ret`
+status=$((status + ret))
 
 echo_i "Shutting down secondary"
 
@@ -277,8 +277,8 @@ echo_i "Checking for secondary's on disk copy of zone"
 
 if [ ! -f ns2/root.bk ]
 then
-       echo_i "failed";
-       status=`expr $status + 1`
+    echo_i "failed";
+    status=$((status + 1))
 fi
 
 echo_i "Re-starting secondary"
@@ -297,7 +297,7 @@ if $test_fixed; then
     $DIFF dig.out.fixed dig.out.fixed.good || ret=1
     done
     if [ $ret != 0 ]; then echo_i "failed"; fi
-    status=`expr $status + $ret`
+    status=$((status + ret))
 fi
 
 #
@@ -308,12 +308,12 @@ ret=0
 matches=0
 for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20
 do
-    j=`expr $i % 4`
+    j=$((i % 4))
     $DIGCMD @10.53.0.2 cyclic.example > dig.out.cyclic || ret=1
     if [ $i -le 4 ]; then
-        cp dig.out.cyclic dig.out.$j
+       cp dig.out.cyclic dig.out.$j
     else
-        $DIFF dig.out.cyclic dig.out.$j >/dev/null && matches=`expr $matches + 1`
+       $DIFF dig.out.cyclic dig.out.$j >/dev/null && matches=$((matches + 1))
     fi
 done
 $DIFF dig.out.0 dig.out.1 >/dev/null && ret=1
@@ -324,7 +324,7 @@ $DIFF dig.out.1 dig.out.3 >/dev/null && ret=1
 $DIFF dig.out.2 dig.out.3 >/dev/null && ret=1
 if [ $matches -ne 16 ]; then ret=1; fi
 if [ $ret != 0 ]; then echo_i "failed"; fi
-status=`expr $status + $ret`
+status=$((status + ret))
 
 #
 #
@@ -334,12 +334,12 @@ ret=0
 matches=0
 for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20
 do
-    j=`expr $i % 4`
+    j=$((i % 4))
     $DIGCMD @10.53.0.2 cyclic2.example > dig.out.cyclic2 || ret=1
     if [ $i -le 4 ]; then
-        cp dig.out.cyclic2 dig.out.$j
+       cp dig.out.cyclic2 dig.out.$j
     else
-        $DIFF dig.out.cyclic2 dig.out.$j >/dev/null && matches=`expr $matches + 1`
+       $DIFF dig.out.cyclic2 dig.out.$j >/dev/null && matches=$((matches + 1))
     fi
 done
 $DIFF dig.out.0 dig.out.1 >/dev/null && ret=1
@@ -350,49 +350,49 @@ $DIFF dig.out.1 dig.out.3 >/dev/null && ret=1
 $DIFF dig.out.2 dig.out.3 >/dev/null && ret=1
 if [ $matches -ne 16 ]; then ret=1; fi
 if [ $ret != 0 ]; then echo_i "failed"; fi
-status=`expr $status + $ret`
+status=$((status + ret))
 
 echo_i "Checking order random (secondary loaded from disk)"
 ret=0
 for i in $GOOD_RANDOM
 do
-       eval match$i=0
+    eval match$i=0
 done
 for i in a b c d e f g h i j k l m n o p q r s t u v w x y z 0 1 2 3 4 5 6 7 9
 do
-       $DIGCMD @10.53.0.2 random.example > dig.out.random || ret=1
-       match=0
-       for j in $GOOD_RANDOM
-       do
-               eval "$DIFF dig.out.random dig.out.random.good$j >/dev/null && match$j=1 match=1"
-               if [ $match -eq 1 ]; then break; fi
-       done
-       if [ $match -eq 0 ]; then ret=1; fi
+    $DIGCMD @10.53.0.2 random.example > dig.out.random || ret=1
+    match=0
+    for j in $GOOD_RANDOM
+    do
+       eval "$DIFF dig.out.random dig.out.random.good$j >/dev/null && match$j=1 match=1"
+       if [ $match -eq 1 ]; then break; fi
+    done
+    if [ $match -eq 0 ]; then ret=1; fi
 done
 match=0
 for i in $GOOD_RANDOM
 do
-eval "match=\`expr \$match + \$match$i\`"
+    eval "match=\$((match + match$i))"
 done
 echo_i "Random selection return $match of ${GOOD_RANDOM_NO} possible orders in 36 samples"
-if [ $match -lt `expr ${GOOD_RANDOM_NO} / 3` ]; then ret=1; fi
+if [ $match -lt $((GOOD_RANDOM_NO / 3)) ]; then ret=1; fi
 if [ $ret != 0 ]; then echo_i "failed"; fi
-status=`expr $status + $ret`
+status=$((status + ret))
 
 echo_i "Checking order none (secondary loaded from disk)"
 ret=0
 # Fetch the "reference" response and ensure it contains the expected records.
 $DIGCMD @10.53.0.2 none.example > dig.out.none || ret=1
 for i in 1 2 3 4; do
-       grep -F -q 1.2.3.$i dig.out.none || ret=1
+    grep -F -q 1.2.3.$i dig.out.none || ret=1
 done
 # Ensure 20 further queries result in the same response as the "reference" one.
 for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20; do
-       $DIGCMD @10.53.0.2 none.example > dig.out.test$i || ret=1
-       $DIFF dig.out.none dig.out.test$i >/dev/null || ret=1
+    $DIGCMD @10.53.0.2 none.example > dig.out.test$i || ret=1
+    $DIFF dig.out.none dig.out.test$i >/dev/null || ret=1
 done
 if [ $ret != 0 ]; then echo_i "failed"; fi
-status=`expr $status + $ret`
+status=$((status + ret))
 
 #
 #
@@ -406,7 +406,7 @@ if $test_fixed; then
     $DIFF dig.out.fixed dig.out.fixed.good || ret=1
     done
     if [ $ret != 0 ]; then echo_i "failed"; fi
-    status=`expr $status + $ret`
+    status=$((status + ret))
 fi
 
 #
@@ -419,12 +419,12 @@ $DIGCMD @10.53.0.3 cyclic.example > dig.out.cyclic || ret=1
 matches=0
 for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20
 do
-    j=`expr $i % 4`
+    j=$((i % 4))
     $DIGCMD @10.53.0.3 cyclic.example > dig.out.cyclic || ret=1
     if [ $i -le 4 ]; then
-        cp dig.out.cyclic dig.out.$j
+       cp dig.out.cyclic dig.out.$j
     else
-        $DIFF dig.out.cyclic dig.out.$j >/dev/null && matches=`expr $matches + 1`
+       $DIFF dig.out.cyclic dig.out.$j >/dev/null && matches=$((matches + 1))
     fi
 done
 $DIFF dig.out.0 dig.out.1 >/dev/null && ret=1
@@ -435,7 +435,7 @@ $DIFF dig.out.1 dig.out.3 >/dev/null && ret=1
 $DIFF dig.out.2 dig.out.3 >/dev/null && ret=1
 if [ $matches -ne 16 ]; then ret=1; fi
 if [ $ret != 0 ]; then echo_i "failed"; fi
-status=`expr $status + $ret`
+status=$((status + ret))
 
 #
 #
@@ -447,12 +447,12 @@ $DIGCMD @10.53.0.3 cyclic2.example > dig.out.cyclic2 || ret=1
 matches=0
 for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20
 do
-    j=`expr $i % 4`
+    j=$((i % 4))
     $DIGCMD @10.53.0.3 cyclic2.example > dig.out.cyclic2 || ret=1
     if [ $i -le 4 ]; then
-        cp dig.out.cyclic2 dig.out.$j
+       cp dig.out.cyclic2 dig.out.$j
     else
-        $DIFF dig.out.cyclic2 dig.out.$j >/dev/null && matches=`expr $matches + 1`
+       $DIFF dig.out.cyclic2 dig.out.$j >/dev/null && matches=$((matches + 1))
     fi
 done
 $DIFF dig.out.0 dig.out.1 >/dev/null && ret=1
@@ -463,32 +463,32 @@ $DIFF dig.out.1 dig.out.3 >/dev/null && ret=1
 $DIFF dig.out.2 dig.out.3 >/dev/null && ret=1
 if [ $matches -ne 16 ]; then ret=1; fi
 if [ $ret != 0 ]; then echo_i "failed"; fi
-status=`expr $status + $ret`
+status=$((status + ret))
 
 echo_i "Checking order random (cache)"
 ret=0
 for i in $GOOD_RANDOM
 do
-       eval match$i=0
+    eval match$i=0
 done
 for i in a b c d e f g h i j k l m n o p q r s t u v w x y z 0 1 2 3 4 5 6 7 9
 do
-       $DIGCMD @10.53.0.3 random.example > dig.out.random || ret=1
-       match=0
-       for j in $GOOD_RANDOM
-       do
-               eval "$DIFF dig.out.random dig.out.random.good$j >/dev/null && match$j=1 match=1"
-               if [ $match -eq 1 ]; then break; fi
-       done
-       if [ $match -eq 0 ]; then ret=1; fi
+    $DIGCMD @10.53.0.3 random.example > dig.out.random || ret=1
+    match=0
+    for j in $GOOD_RANDOM
+    do
+       eval "$DIFF dig.out.random dig.out.random.good$j >/dev/null && match$j=1 match=1"
+       if [ $match -eq 1 ]; then break; fi
+    done
+    if [ $match -eq 0 ]; then ret=1; fi
 done
 match=0
 for i in $GOOD_RANDOM
 do
-eval "match=\`expr \$match + \$match$i\`"
+     eval "match=\$((match + match$i))"
 done
 echo_i "Random selection return $match of ${GOOD_RANDOM_NO} possible orders in 36 samples"
-if [ $match -lt `expr ${GOOD_RANDOM_NO} / 3` ]; then ret=1; fi
+if [ $match -lt $((GOOD_RANDOM_NO / 3)) ]; then ret=1; fi
 if [ $ret != 0 ]; then echo_i "failed"; fi
 status=$((status + ret))
 
@@ -497,57 +497,57 @@ ret=0
 # Fetch the "reference" response and ensure it contains the expected records.
 $DIGCMD @10.53.0.3 none.example > dig.out.none || ret=1
 for i in 1 2 3 4; do
-       grep -F -q 1.2.3.$i dig.out.none || ret=1
+    grep -F -q 1.2.3.$i dig.out.none || ret=1
 done
 # Ensure 20 further queries result in the same response as the "reference" one.
 for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20; do
-       $DIGCMD @10.53.0.3 none.example > dig.out.test$i || ret=1
-       $DIFF dig.out.none dig.out.test$i >/dev/null || ret=1
+    $DIGCMD @10.53.0.3 none.example > dig.out.test$i || ret=1
+    $DIFF dig.out.none dig.out.test$i >/dev/null || ret=1
 done
 if [ $ret != 0 ]; then echo_i "failed"; fi
-status=`expr $status + $ret`
+status=$((status + ret))
 
 echo_i "Checking default order (cache)"
 ret=0
 for i in $GOOD_RANDOM
 do
-       eval match$i=0
+    eval match$i=0
 done
 for i in a b c d e f g h i j k l m n o p q r s t u v w x y z 0 1 2 3 4 5 6 7 9
 do
-       $DIGCMD @10.53.0.5 random.example > dig.out.random || ret=1
-       match=0
-       for j in $GOOD_RANDOM
-       do
-               eval "$DIFF dig.out.random dig.out.random.good$j >/dev/null && match$j=1 match=1"
-               if [ $match -eq 1 ]; then break; fi
-       done
-       if [ $match -eq 0 ]; then ret=1; fi
+    $DIGCMD @10.53.0.5 random.example > dig.out.random || ret=1
+    match=0
+    for j in $GOOD_RANDOM
+    do
+       eval "$DIFF dig.out.random dig.out.random.good$j >/dev/null && match$j=1 match=1"
+       if [ $match -eq 1 ]; then break; fi
+    done
+    if [ $match -eq 0 ]; then ret=1; fi
 done
 match=0
 for i in $GOOD_RANDOM
 do
-eval "match=\`expr \$match + \$match$i\`"
+     eval "match=\$((match + match$i))"
 done
 echo_i "Default selection return $match of ${GOOD_RANDOM_NO} possible orders in 36 samples"
-if [ $match -lt `expr ${GOOD_RANDOM_NO} / 3` ]; then ret=1; fi
+if [ $match -lt $((GOOD_RANDOM_NO / 3)) ]; then ret=1; fi
 if [ $ret != 0 ]; then echo_i "failed"; fi
-status=`expr $status + $ret`
+status=$((status + ret))
 
 echo_i "Checking default order no match in rrset-order (cache)"
 ret=0
 # Fetch the "reference" response and ensure it contains the expected records.
 $DIGCMD @10.53.0.4 nomatch.example > dig.out.nomatch || ret=1
 for i in 1 2 3 4; do
-       grep -F -q 1.2.3.$i dig.out.nomatch || ret=1
+    grep -F -q 1.2.3.$i dig.out.nomatch || ret=1
 done
 # Ensure 20 further queries result in the same response as the "reference" one.
 for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20; do
-       $DIGCMD @10.53.0.4 nomatch.example > dig.out.test$i || ret=1
-       $DIFF dig.out.nomatch dig.out.test$i >/dev/null || ret=1
+    $DIGCMD @10.53.0.4 nomatch.example > dig.out.test$i || ret=1
+    $DIFF dig.out.nomatch dig.out.test$i >/dev/null || ret=1
 done
 if [ $ret != 0 ]; then echo_i "failed"; fi
-status=`expr $status + $ret`
+status=$((status + ret))
 
 echo_i "exit status: $status"
 [ $status -eq 0 ] || exit 1