Test variable rename a->rrcount

(cherry picked from commit 338b45ae713cded921fd3e5494ca38bd59ff9ee8)

diff --git a/bin/tests/system/masterformat/tests.sh b/bin/tests/system/masterformat/tests.sh
index e13a419b5f1d9fefe790333e9733cf789cc91559..769c2b14322b5fd95d8d2a134582a342c148d4a7 100755 (executable)
--- a/bin/tests/system/masterformat/tests.sh
+++ b/bin/tests/system/masterformat/tests.sh
@@ -187,9 +187,9 @@ status=$((status + ret))
 echo_i "checking that large rdatasets loaded ($n)"
 for i in 0 1 2 3 4 5 6 7 8 9; do
   ret=0
-  for a in a b c; do
-    $DIG +tcp txt "${a}.large" @10.53.0.1 -p "${PORT}" >"dig.out.ns1.$a.test$n"
-    grep "status: NOERROR" "dig.out.ns1.$a.test$n" >/dev/null || ret=1
+  for rrcount in a b c; do
+    $DIG +tcp txt "${rrcount}.large" @10.53.0.1 -p "${PORT}" >"dig.out.ns1.$rrcount.test$n"
+    grep "status: NOERROR" "dig.out.ns1.$rrcount.test$n" >/dev/null || ret=1
   done
   [ $ret -eq 0 ] && break
   sleep 1
@@ -201,9 +201,9 @@ status=$((status + ret))
 echo_i "checking that large rdatasets transfered ($n)"
 for i in 0 1 2 3 4 5 6 7 8 9; do
   ret=0
-  for a in a b c; do
-    $DIG +tcp txt "${a}.large" @10.53.0.2 -p "${PORT}" >"dig.out.ns2.$a.test$n"
-    grep "status: NOERROR" "dig.out.ns2.$a.test$n" >/dev/null || ret=1
+  for rrcount in a b c; do
+    $DIG +tcp txt "${rrcount}.large" @10.53.0.2 -p "${PORT}" >"dig.out.ns2.$rrcount.test$n"
+    grep "status: NOERROR" "dig.out.ns2.$rrcount.test$n" >/dev/null || ret=1
   done
   [ $ret -eq 0 ] && break
   sleep 1
@@ -215,9 +215,9 @@ status=$((status + ret))
 echo_i "checking that huge rdatasets loaded ($n)"
 for i in 0 1 2 3 4 5 6 7 8 9; do
   ret=0
-  for a in a b c d; do
-    $DIG +tcp txt "${a}.huge" @10.53.0.1 -p "${PORT}" >"dig.out.ns1.$a.test$n"
-    grep "status: NOERROR" "dig.out.ns1.$a.test$n" >/dev/null || ret=1
+  for rrcount in a b c d; do
+    $DIG +tcp txt "${rrcount}.huge" @10.53.0.1 -p "${PORT}" >"dig.out.ns1.$rrcount.test$n"
+    grep "status: NOERROR" "dig.out.ns1.$rrcount.test$n" >/dev/null || ret=1
   done
   [ $ret -eq 0 ] && break
   sleep 1
@@ -229,9 +229,9 @@ status=$((status + ret))
 echo_i "checking that huge rdatasets not transfered ($n)"
 for i in 0 1 2 3 4 5 6 7 8 9; do
   ret=0
-  for a in a b c d; do
-    $DIG +tcp txt "${a}.huge" @10.53.0.2 -p "${PORT}" >"dig.out.ns2.$a.test$n"
-    grep "status: SERVFAIL" "dig.out.ns2.$a.test$n" >/dev/null || ret=1
+  for rrcount in a b c d; do
+    $DIG +tcp txt "${rrcount}.huge" @10.53.0.2 -p "${PORT}" >"dig.out.ns2.$rrcount.test$n"
+    grep "status: SERVFAIL" "dig.out.ns2.$rrcount.test$n" >/dev/null || ret=1
   done
   [ $ret -eq 0 ] && break
   sleep 1
@@ -243,9 +243,9 @@ status=$((status + ret))
 echo_i "checking that uber rdatasets not loaded ($n)"
 for i in 0 1 2 3 4 5 6 7 8 9; do
   ret=0
-  for a in a b c d e; do
-    $DIG +tcp txt "${a}.uber" @10.53.0.1 -p "${PORT}" >"dig.out.ns1.$a.test$n"
-    grep "status: SERVFAIL" "dig.out.ns1.$a.test$n" >/dev/null || ret=1
+  for rrcount in a b c d e; do
+    $DIG +tcp txt "${rrcount}.uber" @10.53.0.1 -p "${PORT}" >"dig.out.ns1.$rrcount.test$n"
+    grep "status: SERVFAIL" "dig.out.ns1.$rrcount.test$n" >/dev/null || ret=1
   done
   [ $ret -eq 0 ] && break
   sleep 1