Merging upstream version 1:9.16.48.

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

1 files changed, 45 insertions, 45 deletions

diff --git a/bin/tests/system/nslookup/tests.sh b/bin/tests/system/nslookup/tests.sh
index 2be4eac..9d3a54e 100644
--- a/bin/tests/system/nslookup/tests.sh
+++ b/bin/tests/system/nslookup/tests.sh
@@ -17,96 +17,96 @@ SYSTEMTESTTOP=..
 status=0
 n=0
 
-n=`expr $n + 1`
+n=$(expr $n + 1)
 echo_i "Check that domain names that are too big when applying a search list entry are handled cleanly ($n)"
 ret=0
 l=012345678901234567890123456789012345678901234567890123456789012
 t=0123456789012345678901234567890123456789012345678901234567890
 d=$l.$l.$l.$t
-$NSLOOKUP -port=${PORT} -domain=$d -type=soa example 10.53.0.1 > nslookup.out${n} || ret=1
-grep "origin = ns1.example" nslookup.out${n} > /dev/null || ret=1
+$NSLOOKUP -port=${PORT} -domain=$d -type=soa example 10.53.0.1 >nslookup.out${n} || ret=1
+grep "origin = ns1.example" nslookup.out${n} >/dev/null || ret=1
 if [ $ret != 0 ]; then echo_i "failed"; fi
-status=`expr $status + $ret`
+status=$(expr $status + $ret)
 
-n=`expr $n + 1`
+n=$(expr $n + 1)
 echo_i "Check A only lookup"
 ret=0
-$NSLOOKUP -port=${PORT} a-only.example.net 10.53.0.1 > nslookup.out${n} || ret=1
-lines=`grep "Server:" nslookup.out${n} | wc -l`
+$NSLOOKUP -port=${PORT} a-only.example.net 10.53.0.1 >nslookup.out${n} || ret=1
+lines=$(grep "Server:" nslookup.out${n} | wc -l)
 test $lines = 1 || ret=1
-lines=`grep a-only.example.net nslookup.out${n} | wc -l`
+lines=$(grep a-only.example.net nslookup.out${n} | wc -l)
 test $lines = 1 || ret=1
-grep "1.2.3.4" nslookup.out${n} > /dev/null || ret=1
+grep "1.2.3.4" nslookup.out${n} >/dev/null || ret=1
 if [ $ret != 0 ]; then echo_i "failed"; fi
-status=`expr $status + $ret`
+status=$(expr $status + $ret)
 
-n=`expr $n + 1`
+n=$(expr $n + 1)
 echo_i "Check AAAA only lookup"
 ret=0
-$NSLOOKUP -port=${PORT} aaaa-only.example.net 10.53.0.1 > nslookup.out${n} || ret=1
-lines=`grep "Server:" nslookup.out${n} | wc -l`
+$NSLOOKUP -port=${PORT} aaaa-only.example.net 10.53.0.1 >nslookup.out${n} || ret=1
+lines=$(grep "Server:" nslookup.out${n} | wc -l)
 test $lines = 1 || ret=1
-lines=`grep aaaa-only.example.net nslookup.out${n} | wc -l`
+lines=$(grep aaaa-only.example.net nslookup.out${n} | wc -l)
 test $lines = 1 || ret=1
-grep "2001::ffff" nslookup.out${n} > /dev/null || ret=1
+grep "2001::ffff" nslookup.out${n} >/dev/null || ret=1
 if [ $ret != 0 ]; then echo_i "failed"; fi
-status=`expr $status + $ret`
+status=$(expr $status + $ret)
 
-n=`expr $n + 1`
+n=$(expr $n + 1)
 echo_i "Check dual A + AAAA lookup"
 ret=0
-$NSLOOKUP -port=${PORT} dual.example.net 10.53.0.1 > nslookup.out${n} || ret=1
-lines=`grep "Server:" nslookup.out${n} | wc -l`
+$NSLOOKUP -port=${PORT} dual.example.net 10.53.0.1 >nslookup.out${n} || ret=1
+lines=$(grep "Server:" nslookup.out${n} | wc -l)
 test $lines = 1 || ret=1
-lines=`grep dual.example.net nslookup.out${n} | wc -l`
+lines=$(grep dual.example.net nslookup.out${n} | wc -l)
 test $lines = 2 || ret=1
-grep "1.2.3.4" nslookup.out${n} > /dev/null || ret=1
-grep "2001::ffff" nslookup.out${n} > /dev/null || ret=1
+grep "1.2.3.4" nslookup.out${n} >/dev/null || ret=1
+grep "2001::ffff" nslookup.out${n} >/dev/null || ret=1
 if [ $ret != 0 ]; then echo_i "failed"; fi
-status=`expr $status + $ret`
+status=$(expr $status + $ret)
 
-n=`expr $n + 1`
+n=$(expr $n + 1)
 echo_i "Check CNAME to A only lookup"
 ret=0
-$NSLOOKUP -port=${PORT} cname-a-only.example.net 10.53.0.1 > nslookup.out${n} || ret=1
-lines=`grep "Server:" nslookup.out${n} | wc -l`
+$NSLOOKUP -port=${PORT} cname-a-only.example.net 10.53.0.1 >nslookup.out${n} || ret=1
+lines=$(grep "Server:" nslookup.out${n} | wc -l)
 test $lines = 1 || ret=1
-lines=`grep "canonical name" nslookup.out${n} | wc -l`
+lines=$(grep "canonical name" nslookup.out${n} | wc -l)
 test $lines = 1 || ret=1
-lines=`grep a-only.example.net nslookup.out${n} | grep -v "canonical name" | wc -l`
+lines=$(grep a-only.example.net nslookup.out${n} | grep -v "canonical name" | wc -l)
 test $lines = 1 || ret=1
-grep "1.2.3.4" nslookup.out${n} > /dev/null || ret=1
+grep "1.2.3.4" nslookup.out${n} >/dev/null || ret=1
 if [ $ret != 0 ]; then echo_i "failed"; fi
-status=`expr $status + $ret`
+status=$(expr $status + $ret)
 
-n=`expr $n + 1`
+n=$(expr $n + 1)
 echo_i "Check CNAME to AAAA only lookup"
 ret=0
-$NSLOOKUP -port=${PORT} cname-aaaa-only.example.net 10.53.0.1 > nslookup.out${n} || ret=1
-lines=`grep "Server:" nslookup.out${n} | wc -l`
+$NSLOOKUP -port=${PORT} cname-aaaa-only.example.net 10.53.0.1 >nslookup.out${n} || ret=1
+lines=$(grep "Server:" nslookup.out${n} | wc -l)
 test $lines = 1 || ret=1
-lines=`grep "canonical name" nslookup.out${n} | wc -l`
+lines=$(grep "canonical name" nslookup.out${n} | wc -l)
 test $lines = 1 || ret=1
-lines=`grep aaaa-only.example.net nslookup.out${n} | grep -v "canonical name" |wc -l`
+lines=$(grep aaaa-only.example.net nslookup.out${n} | grep -v "canonical name" | wc -l)
 test $lines = 1 || ret=1
-grep "2001::ffff" nslookup.out${n} > /dev/null || ret=1
+grep "2001::ffff" nslookup.out${n} >/dev/null || ret=1
 if [ $ret != 0 ]; then echo_i "failed"; fi
-status=`expr $status + $ret`
+status=$(expr $status + $ret)
 
-n=`expr $n + 1`
+n=$(expr $n + 1)
 echo_i "Check CNAME to dual A + AAAA lookup"
 ret=0
-$NSLOOKUP -port=${PORT} cname-dual.example.net 10.53.0.1 > nslookup.out${n} || ret=1
-lines=`grep "Server:" nslookup.out${n} | wc -l`
+$NSLOOKUP -port=${PORT} cname-dual.example.net 10.53.0.1 >nslookup.out${n} || ret=1
+lines=$(grep "Server:" nslookup.out${n} | wc -l)
 test $lines = 1 || ret=1
-lines=`grep "canonical name" nslookup.out${n} | wc -l`
+lines=$(grep "canonical name" nslookup.out${n} | wc -l)
 test $lines = 1 || ret=1
-lines=`grep dual.example.net nslookup.out${n} | grep -v "canonical name" | wc -l`
+lines=$(grep dual.example.net nslookup.out${n} | grep -v "canonical name" | wc -l)
 test $lines = 2 || ret=1
-grep "1.2.3.4" nslookup.out${n} > /dev/null || ret=1
-grep "2001::ffff" nslookup.out${n} > /dev/null || ret=1
+grep "1.2.3.4" nslookup.out${n} >/dev/null || ret=1
+grep "2001::ffff" nslookup.out${n} >/dev/null || ret=1
 if [ $ret != 0 ]; then echo_i "failed"; fi
-status=`expr $status + $ret`
+status=$(expr $status + $ret)
 
 echo_i "exit status: $status"
 [ $status -eq 0 ] || exit 1