Merging upstream version 1:9.16.48.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 59 insertions, 46 deletions

diff --git a/bin/tests/system/rrchecker/tests.sh b/bin/tests/system/rrchecker/tests.sh
index 7990e65..ece9c60 100644
--- a/bin/tests/system/rrchecker/tests.sh
+++ b/bin/tests/system/rrchecker/tests.sh
@@ -17,68 +17,81 @@ SYSTEMTESTTOP=..
 status=0
 n=0
 
-n=`expr $n + 1`
+n=$(expr $n + 1)
 echo_i "class list ($n)"
-$RRCHECKER -C > classlist.out
-$DIFF classlist.out classlist.good || { echo_i "failed"; status=`expr $status + 1`; }
+$RRCHECKER -C >classlist.out
+$DIFF classlist.out classlist.good || {
+  echo_i "failed"
+  status=$(expr $status + 1)
+}
 
-n=`expr $n + 1`
+n=$(expr $n + 1)
 echo_i "type list ($n)"
-$RRCHECKER -T > typelist.out
-$DIFF typelist.out typelist.good || { echo_i "failed"; status=`expr $status + 1`; }
+$RRCHECKER -T >typelist.out
+$DIFF typelist.out typelist.good || {
+  echo_i "failed"
+  status=$(expr $status + 1)
+}
 
-n=`expr $n + 1`
+n=$(expr $n + 1)
 echo_i "private type list ($n)"
-$RRCHECKER -P > privatelist.out
-$DIFF privatelist.out privatelist.good || { echo_i "failed"; status=`expr $status + 1`; }
+$RRCHECKER -P >privatelist.out
+$DIFF privatelist.out privatelist.good || {
+  echo_i "failed"
+  status=$(expr $status + 1)
+}
 
 myecho() {
-cat << EOF
+  cat <<EOF
 $*
 EOF
 }
 
-n=`expr $n + 1`
+n=$(expr $n + 1)
 echo_i "check conversions to canonical format ($n)"
 ret=0
-$SHELL ../genzone.sh 0 > tempzone
-$CHECKZONE -Dq . tempzone | sed '/^;/d' > checkzone.out$n
-while read -r name tt cl ty rest
-do
-	myecho "$cl $ty $rest" | $RRCHECKER -p > checker.out || {
-		ret=1
-		echo_i "'$cl $ty $rest' not handled."
-	}
-	read -r cl0 ty0 rest0 < checker.out
-	test "$cl $ty $rest" = "$cl0 $ty0 $rest0" || {
-		ret=1
-		echo_i "'$cl $ty $rest' != '$cl0 $ty0 $rest0'"
-	}
-done < checkzone.out$n
-test $ret -eq 0 || { echo_i "failed"; status=`expr $status + 1`; }
+$SHELL ../genzone.sh 0 >tempzone
+$CHECKZONE -Dq . tempzone | sed '/^;/d' >checkzone.out$n
+while read -r name tt cl ty rest; do
+  myecho "$cl $ty $rest" | $RRCHECKER -p >checker.out || {
+    ret=1
+    echo_i "'$cl $ty $rest' not handled."
+  }
+  read -r cl0 ty0 rest0 <checker.out
+  test "$cl $ty $rest" = "$cl0 $ty0 $rest0" || {
+    ret=1
+    echo_i "'$cl $ty $rest' != '$cl0 $ty0 $rest0'"
+  }
+done <checkzone.out$n
+test $ret -eq 0 || {
+  echo_i "failed"
+  status=$(expr $status + 1)
+}
 
-n=`expr $n + 1`
+n=$(expr $n + 1)
 echo_i "check conversions to and from unknown record format ($n)"
 ret=0
-$CHECKZONE -Dq . tempzone | sed '/^;/d' > checkzone.out$n
-while read -r name tt cl ty rest
-do
-	myecho "$cl $ty $rest" | $RRCHECKER -u > checker.out || {
-		ret=1
-		echo_i "'$cl $ty $rest' not converted to unknown record format"
-	}
-	read -r clu tyu restu < checker.out
-	myecho "$clu $tyu $restu" | $RRCHECKER -p > checker.out || {
-		ret=1
-		echo_i "'$cl $ty $rest' not converted back to canonical format"
-	}
-	read -r cl0 ty0 rest0 < checker.out
-	test "$cl $ty $rest" = "$cl0 $ty0 $rest0" || {
-		ret=1
-		echo_i "'$cl $ty $rest' != '$cl0 $ty0 $rest0'"
-	}
-done < checkzone.out$n
-test $ret -eq 0 || { echo_i "failed"; status=`expr $status + 1`; }
+$CHECKZONE -Dq . tempzone | sed '/^;/d' >checkzone.out$n
+while read -r name tt cl ty rest; do
+  myecho "$cl $ty $rest" | $RRCHECKER -u >checker.out || {
+    ret=1
+    echo_i "'$cl $ty $rest' not converted to unknown record format"
+  }
+  read -r clu tyu restu <checker.out
+  myecho "$clu $tyu $restu" | $RRCHECKER -p >checker.out || {
+    ret=1
+    echo_i "'$cl $ty $rest' not converted back to canonical format"
+  }
+  read -r cl0 ty0 rest0 <checker.out
+  test "$cl $ty $rest" = "$cl0 $ty0 $rest0" || {
+    ret=1
+    echo_i "'$cl $ty $rest' != '$cl0 $ty0 $rest0'"
+  }
+done <checkzone.out$n
+test $ret -eq 0 || {
+  echo_i "failed"
+  status=$(expr $status + 1)
+}
 
 echo_i "exit status: $status"
 [ $status -eq 0 ] || exit 1