Merging upstream version 1:9.18.24.

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

1 files changed, 33 insertions, 33 deletions

diff --git a/bin/tests/system/host/tests.sh b/bin/tests/system/host/tests.sh
index c640a40..4bc3bf9 100644
--- a/bin/tests/system/host/tests.sh
+++ b/bin/tests/system/host/tests.sh
@@ -19,54 +19,54 @@ set -e
 status=0
 n=0
 
-n=$((n+1))
+n=$((n + 1))
 echo_i "Check A only lookup ($n)"
 ret=0
-$HOST -p ${PORT} a-only.example.net 10.53.0.1 2> host.err${n} > host.out${n} || ret=1
-lines=$(wc -l < host.err${n})
+$HOST -p ${PORT} a-only.example.net 10.53.0.1 2>host.err${n} >host.out${n} || ret=1
+lines=$(wc -l <host.err${n})
 test $lines -eq 0 || ret=1
 lines=$(grep -c "Address:" host.out${n})
 test $lines -eq 1 || ret=1
 lines=$(grep -c a-only.example.net host.out${n})
 test $lines -eq 1 || ret=1
-grep "1.2.3.4" host.out${n} > /dev/null || ret=1
+grep "1.2.3.4" host.out${n} >/dev/null || ret=1
 if [ $ret != 0 ]; then echo_i "failed"; fi
-status=$((status+ret))
+status=$((status + ret))
 
-n=$((n+1))
+n=$((n + 1))
 echo_i "Check AAAA only lookup ($n)"
 ret=0
-$HOST -p ${PORT} aaaa-only.example.net 10.53.0.1 2> host.err${n} > host.out${n} || ret=1
-lines=$(wc -l < host.err${n})
+$HOST -p ${PORT} aaaa-only.example.net 10.53.0.1 2>host.err${n} >host.out${n} || ret=1
+lines=$(wc -l <host.err${n})
 test $lines -eq 0 || ret=1
 lines=$(grep -c "Address:" host.out${n})
 test $lines -eq 1 || ret=1
 lines=$(grep -c aaaa-only.example.net host.out${n})
 test $lines -eq 1 || ret=1
-grep "2001::ffff" host.out${n} > /dev/null || ret=1
+grep "2001::ffff" host.out${n} >/dev/null || ret=1
 if [ $ret != 0 ]; then echo_i "failed"; fi
-status=$((status+ret))
+status=$((status + ret))
 
-n=$((n+1))
+n=$((n + 1))
 echo_i "Check dual A + AAAA lookup ($n)"
 ret=0
-$HOST -p ${PORT} dual.example.net 10.53.0.1 2> host.err${n} > host.out${n} || ret=1
-lines=$(wc -l < host.err${n})
+$HOST -p ${PORT} dual.example.net 10.53.0.1 2>host.err${n} >host.out${n} || ret=1
+lines=$(wc -l <host.err${n})
 test $lines -eq 0 || ret=1
 lines=$(grep -c "Address:" host.out${n})
 test $lines -eq 1 || ret=1
 lines=$(grep -c dual.example.net host.out${n})
 test $lines -eq 2 || ret=1
-grep "1.2.3.4" host.out${n} > /dev/null || ret=1
-grep "2001::ffff" host.out${n} > /dev/null || ret=1
+grep "1.2.3.4" host.out${n} >/dev/null || ret=1
+grep "2001::ffff" host.out${n} >/dev/null || ret=1
 if [ $ret != 0 ]; then echo_i "failed"; fi
-status=$((status+ret))
+status=$((status + ret))
 
-n=$((n+1))
+n=$((n + 1))
 echo_i "Check CNAME to A only lookup ($n)"
 ret=0
-$HOST -p ${PORT} cname-a-only.example.net 10.53.0.1 2> host.err${n} > host.out${n} || ret=1
-lines=$(wc -l < host.err${n})
+$HOST -p ${PORT} cname-a-only.example.net 10.53.0.1 2>host.err${n} >host.out${n} || ret=1
+lines=$(wc -l <host.err${n})
 test $lines -eq 0 || ret=1
 lines=$(grep -c "Address:" host.out${n})
 test $lines -eq 1 || ret=1
@@ -74,15 +74,15 @@ lines=$(grep -c "cname-a-only.example.net is an alias for a-only.example.net" ho
 test $lines -eq 1 || ret=1
 lines=$(grep a-only.example.net host.out${n} | grep -cv "is an alias for")
 test $lines -eq 1 || ret=1
-grep "1.2.3.4" host.out${n} > /dev/null || ret=1
+grep "1.2.3.4" host.out${n} >/dev/null || ret=1
 if [ $ret != 0 ]; then echo_i "failed"; fi
-status=$((status+ret))
+status=$((status + ret))
 
-n=$((n+1))
+n=$((n + 1))
 echo_i "Check CNAME to AAAA only lookup ($n)"
 ret=0
-$HOST -p ${PORT} cname-aaaa-only.example.net 10.53.0.1 2> host.err${n} > host.out${n} || ret=1
-lines=$(wc -l < host.err${n})
+$HOST -p ${PORT} cname-aaaa-only.example.net 10.53.0.1 2>host.err${n} >host.out${n} || ret=1
+lines=$(wc -l <host.err${n})
 test $lines -eq 0 || ret=1
 lines=$(grep -c "Address:" host.out${n})
 test $lines -eq 1 || ret=1
@@ -90,15 +90,15 @@ lines=$(grep -c "cname-aaaa-only.example.net is an alias for aaaa-only.example.n
 test $lines -eq 1 || ret=1
 lines=$(grep aaaa-only.example.net host.out${n} | grep -cv "is an alias for")
 test $lines -eq 1 || ret=1
-grep "2001::ffff" host.out${n} > /dev/null || ret=1
+grep "2001::ffff" host.out${n} >/dev/null || ret=1
 if [ $ret != 0 ]; then echo_i "failed"; fi
-status=$((status+ret))
+status=$((status + ret))
 
-n=$((n+1))
+n=$((n + 1))
 echo_i "Check CNAME to dual A + AAAA lookup ($n)"
 ret=0
-$HOST -p ${PORT} cname-dual.example.net 10.53.0.1 2> host.err${n} > host.out${n} || ret=1
-lines=$(wc -l < host.err${n})
+$HOST -p ${PORT} cname-dual.example.net 10.53.0.1 2>host.err${n} >host.out${n} || ret=1
+lines=$(wc -l <host.err${n})
 test $lines -eq 0 || ret=1
 lines=$(grep -c "Address:" host.out${n})
 test $lines -eq 1 || ret=1
@@ -109,12 +109,12 @@ test $lines -eq 1 || ret=1
 lines=$(grep -c "dual.example.net has IPv6 address 2001::ffff" host.out${n})
 test $lines -eq 1 || ret=1
 if [ $ret != 0 ]; then echo_i "failed"; fi
-status=$((status+ret))
+status=$((status + ret))
 
-n=$((n+1))
+n=$((n + 1))
 echo_i "Check ANY lookup ($n)"
 ret=0
-$HOST -p ${PORT} -t ANY example.net 10.53.0.1 2> host.err${n} > host.out${n} || ret=1
+$HOST -p ${PORT} -t ANY example.net 10.53.0.1 2>host.err${n} >host.out${n} || ret=1
 lines=$(grep -c 'Address:.10\.53\.0\.1#'"${PORT}" host.out${n})
 test $lines -eq 1 || ret=1
 lines=$(grep -c 'example.net has SOA record ns1.example.net. hostmaster.example.net. 1397051952 5 5 1814400 3600' host.out${n})
@@ -122,7 +122,7 @@ test $lines -eq 1 || ret=1
 lines=$(grep -c 'example.net name server ns1.example.net.' host.out${n})
 test $lines -eq 1 || ret=1
 if [ $ret != 0 ]; then echo_i "failed"; fi
-status=$((status+ret))
+status=$((status + ret))
 
 echo_i "exit status: $status"
 [ $status -eq 0 ] || exit 1