ComputerSurge/bind9
3
0
Fork 0
Code Pull Requests 1 Activity

Use arithmetic expansion in system tests

Browse Source 
Change the way arithmetic operations are performed in system test shell
scripts from using `expr` to `$(())`. This ensures that updating the
variable won't end up with a non-zero exit code, which would case the
script to exit prematurely when `set -e` is in effect.

The following replacements were performed using sed in all text files
(git grep -Il '' | xargs sed -i):

s/status=`expr $status + $ret`/status=$((status + ret))/g
s/n=`expr $n + 1`/n=$((n + 1))/g
s/t=`expr $t + 1`/t=$((t + 1))/g
s/status=`expr $status + 1`/status=$((status + 1))/g
s/try=`expr $try + 1`/try=$((try + 1))/g

(manually picked from commit 4d42bdc245)
This commit is contained in:
Tom Krizek
2023-06-08 15:34:30 +02:00
parent d715bae429
commit 6f07ba6b7d
52 changed files with 2042 additions and 2042 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
bin/tests/system/unknown/tests.sh
View File

@@ -36,7 +36,7 @@ do
then
echo_i "#$i failed"
fi
status=`expr $status + $ret`
status=$((status + ret))
done
n=$((n+1))
@@ -50,7 +50,7 @@ do
then
echo_i "#$i failed"
fi
status=`expr $status + $ret`
status=$((status + ret))
done
n=$((n+1))
@@ -64,7 +64,7 @@ do
then
echo_i "#$i failed"
fi
status=`expr $status + $ret`
status=$((status + ret))
done
n=$((n+1))
@@ -73,7 +73,7 @@ ret=0
dig_cmd +short @10.53.0.1 null.example null in > dig.out.test$n
echo '\# 1 00' | diff - dig.out.test$n || ret=1
[ $ret = 0 ] || echo_i "failed"
status=`expr $status + $ret`
status=$((status + ret))
n=$((n+1))
echo_i "querying for empty NULL record ($n)"
@@ -81,7 +81,7 @@ ret=0
dig_cmd +short @10.53.0.1 empty.example null in > dig.out.test$n
echo '\# 0' | diff - dig.out.test$n || ret=1
[ $ret = 0 ] || echo_i "failed"
status=`expr $status + $ret`
status=$((status + ret))
n=$((n+1))
echo_i "querying for various representations of a CLASS10 TYPE1 record ($n)"
@@ -94,7 +94,7 @@ do
then
echo_i "#$i failed"
fi
status=`expr $status + $ret`
status=$((status + ret))
done
n=$((n+1))
@@ -108,7 +108,7 @@ do
then
echo_i "#$i failed"
fi
status=`expr $status + $ret`
status=$((status + ret))
done
n=$((n+1))
@@ -122,7 +122,7 @@ do
then
echo_i "#$i failed"
fi
status=`expr $status + $ret`
status=$((status + ret))
done
n=$((n+1))
@@ -136,7 +136,7 @@ do
then
echo_i "#$i failed"
fi
status=`expr $status + $ret`
status=$((status + ret))
done
n=$((n+1))
@@ -149,7 +149,7 @@ for try in 0 1 2 3 4 5 6 7 8 9; do
sleep 1
done
[ $ret = 0 ] || echo_i "failed"
status=`expr $status + $ret`
status=$((status + ret))
n=$((n+1))
echo_i "checking large unknown record loading on secondary ($n)"
@@ -161,7 +161,7 @@ for try in 0 1 2 3 4 5 6 7 8 9; do
sleep 1
done
[ $ret = 0 ] || echo_i "failed"
status=`expr $status + $ret`
status=$((status + ret))
echo_i "stop and restart secondary"
stop_server ns2
@@ -179,7 +179,7 @@ for try in 0 1 2 3 4 5 6 7 8 9; do
sleep 1
done
[ $ret = 0 ] || echo_i "failed"
status=`expr $status + $ret`
status=$((status + ret))
n=$((n+1))
echo_i "checking large unknown record loading on inline secondary ($n)"
@@ -187,7 +187,7 @@ ret=0
dig_cmd @10.53.0.3 +tcp +short large.example TYPE45234 > dig.out.test$n
diff large.out dig.out.test$n > /dev/null || { ret=1 ; echo_i "diff failed"; }
[ $ret = 0 ] || echo_i "failed"
status=`expr $status + $ret`
status=$((status + ret))
echo_i "stop and restart inline secondary"
stop_server ns3
@@ -205,7 +205,7 @@ for try in 0 1 2 3 4 5 6 7 8 9; do
sleep 1
done
[ $ret = 0 ] || echo_i "failed"
status=`expr $status + $ret`
status=$((status + ret))
n=$((n+1))
echo_i "check that '"'"\\#"'"' is not treated as the unknown escape sequence ($n)"
@@ -213,7 +213,7 @@ ret=0
dig_cmd @10.53.0.1 +tcp +short txt8.example txt > dig.out.test$n
echo '"#" "2" "0145"' | diff - dig.out.test$n || ret=1
[ $ret = 0 ] || echo_i "failed"
status=`expr $status + $ret`
status=$((status + ret))
n=$((n+1))
echo_i "check that 'TXT \# text' is not treated as the unknown escape sequence ($n)"
@@ -221,7 +221,7 @@ ret=0
dig_cmd @10.53.0.1 +tcp +short txt9.example txt > dig.out.test$n
echo '"#" "text"' | diff - dig.out.test$n || ret=1
[ $ret = 0 ] || echo_i "failed"
status=`expr $status + $ret`
status=$((status + ret))
n=$((n+1))
echo_i "check that 'TYPE353 \# cat' produces 'not a valid number' ($n)"
@@ -229,7 +229,7 @@ ret=0
$CHECKZONE nan.bad zones/nan.bad > check.out 2>&1
grep "not a valid number" check.out > /dev/null || ret=1
[ $ret = 0 ] || echo_i "failed"
status=`expr $status + $ret`
status=$((status + ret))
echo_i "exit status: $status"
[ $status -eq 0 ] || exit 1