173 lines
6.0 KiB
Diff
173 lines
6.0 KiB
Diff
From fc7ed00d70e616d3cce026dc35fc9b19a7598b9f Mon Sep 17 00:00:00 2001
|
|
From: Evan Hunt <each@isc.org>
|
|
Date: Fri, 4 Mar 2022 15:13:25 -0800
|
|
Subject: [PATCH] update shell syntax
|
|
|
|
clean up the shell syntax in the checkzone test prior to adding
|
|
a new test.
|
|
|
|
(cherry picked from commit 2261c853b521e60500ed355961646bc2d3b0ed06)
|
|
Conflict: NA
|
|
Reference: https://gitlab.isc.org/isc-projects/bind9/-/commit/fc7ed00d70e616d3cce026dc35fc9b19a7598b9f
|
|
---
|
|
bin/tests/system/checkzone/tests.sh | 54 ++++++++++++++---------------
|
|
1 file changed, 27 insertions(+), 27 deletions(-)
|
|
|
|
diff --git a/bin/tests/system/checkzone/tests.sh b/bin/tests/system/checkzone/tests.sh
|
|
index 10c218925c..1e772f9d72 100644
|
|
--- a/bin/tests/system/checkzone/tests.sh
|
|
+++ b/bin/tests/system/checkzone/tests.sh
|
|
@@ -30,9 +30,9 @@ do
|
|
$CHECKZONE -i local example $db > test.out.$n 2>&1 || ret=1
|
|
;;
|
|
esac
|
|
- n=`expr $n + 1`
|
|
+ n=$((n+1))
|
|
if [ $ret != 0 ]; then echo_i "failed"; fi
|
|
- status=`expr $status + $ret`
|
|
+ status=$((status+ret))
|
|
done
|
|
|
|
for db in zones/bad*.db
|
|
@@ -48,9 +48,9 @@ do
|
|
;;
|
|
esac
|
|
test $v = 1 || ret=1
|
|
- n=`expr $n + 1`
|
|
+ n=$((n+1))
|
|
if [ $ret != 0 ]; then echo_i "failed"; fi
|
|
- status=`expr $status + $ret`
|
|
+ status=$((status+ret))
|
|
done
|
|
|
|
echo_i "checking with journal file ($n)"
|
|
@@ -58,16 +58,16 @@ ret=0
|
|
$CHECKZONE -D -o test.orig.db test zones/test1.db > /dev/null 2>&1 || ret=1
|
|
$CHECKZONE -D -o test.changed.db test zones/test2.db > /dev/null 2>&1 || ret=1
|
|
$MAKEJOURNAL test test.orig.db test.changed.db test.orig.db.jnl 2>&1 || ret=1
|
|
-jlines=`$JOURNALPRINT test.orig.db.jnl | wc -l`
|
|
+jlines=$($JOURNALPRINT test.orig.db.jnl | wc -l)
|
|
[ $jlines = 3 ] || ret=1
|
|
$CHECKZONE -D -j -o test.out1.db test test.orig.db > /dev/null 2>&1 || ret=1
|
|
cmp -s test.changed.db test.out1.db || ret=1
|
|
mv -f test.orig.db.jnl test.journal
|
|
$CHECKZONE -D -J test.journal -o test.out2.db test test.orig.db > /dev/null 2>&1 || ret=1
|
|
cmp -s test.changed.db test.out2.db || ret=1
|
|
-n=`expr $n + 1`
|
|
+n=$((n+1))
|
|
if [ $ret != 0 ]; then echo_i "failed"; fi
|
|
-status=`expr $status + $ret`
|
|
+status=$((status+ret))
|
|
|
|
echo_i "checking with spf warnings ($n)"
|
|
ret=0
|
|
@@ -79,25 +79,25 @@ grep "'example' found type SPF" test.out1.$n > /dev/null && ret=1
|
|
grep "'x.example' found type SPF" test.out2.$n > /dev/null && ret=1
|
|
grep "'y.example' found type SPF" test.out2.$n > /dev/null && ret=1
|
|
grep "'example' found type SPF" test.out2.$n > /dev/null && ret=1
|
|
-n=`expr $n + 1`
|
|
+n=$((n+1))
|
|
if [ $ret != 0 ]; then echo_i "failed"; fi
|
|
-status=`expr $status + $ret`
|
|
+status=$((status+ret))
|
|
|
|
echo_i "checking with max ttl (text) ($n)"
|
|
ret=0
|
|
$CHECKZONE -l 300 example zones/good1.db > test.out1.$n 2>&1 && ret=1
|
|
$CHECKZONE -l 600 example zones/good1.db > test.out2.$n 2>&1 || ret=1
|
|
-n=`expr $n + 1`
|
|
+n=$((n+1))
|
|
if [ $ret != 0 ]; then echo_i "failed"; fi
|
|
-status=`expr $status + $ret`
|
|
+status=$((status+ret))
|
|
|
|
echo_i "checking with max ttl (raw) ($n)"
|
|
ret=0
|
|
$CHECKZONE -f raw -l 300 example good1.db.raw > test.out1.$n 2>&1 && ret=1
|
|
$CHECKZONE -f raw -l 600 example good1.db.raw > test.out2.$n 2>&1 || ret=1
|
|
-n=`expr $n + 1`
|
|
+n=$((n+1))
|
|
if [ $ret != 0 ]; then echo_i "failed"; fi
|
|
-status=`expr $status + $ret`
|
|
+status=$((status+ret))
|
|
|
|
echo_i "checking with max ttl (map) ($n)"
|
|
ret=0
|
|
@@ -111,33 +111,33 @@ echo_i "checking for no 'inherited owner' warning on '\$INCLUDE file' with no ne
|
|
ret=0
|
|
$CHECKZONE example zones/nowarn.inherited.owner.db > test.out1.$n 2>&1 || ret=1
|
|
grep "inherited.owner" test.out1.$n > /dev/null && ret=1
|
|
-n=`expr $n + 1`
|
|
+n=$((n+1))
|
|
if [ $ret != 0 ]; then echo_i "failed"; fi
|
|
-status=`expr $status + $ret`
|
|
+status=$((status+ret))
|
|
|
|
echo_i "checking for 'inherited owner' warning on '\$ORIGIN + \$INCLUDE file' ($n)"
|
|
ret=0
|
|
$CHECKZONE example zones/warn.inherit.origin.db > test.out1.$n 2>&1 || ret=1
|
|
grep "inherited.owner" test.out1.$n > /dev/null || ret=1
|
|
-n=`expr $n + 1`
|
|
+n=$((n+1))
|
|
if [ $ret != 0 ]; then echo_i "failed"; fi
|
|
-status=`expr $status + $ret`
|
|
+status=$((status+ret))
|
|
|
|
echo_i "checking for 'inherited owner' warning on '\$INCLUDE file origin' ($n)"
|
|
ret=0
|
|
$CHECKZONE example zones/warn.inherited.owner.db > test.out1.$n 2>&1 || ret=1
|
|
grep "inherited.owner" test.out1.$n > /dev/null || ret=1
|
|
-n=`expr $n + 1`
|
|
+n=$((n+1))
|
|
if [ $ret != 0 ]; then echo_i "failed"; fi
|
|
-status=`expr $status + $ret`
|
|
+status=$((status+ret))
|
|
|
|
echo_i "checking that raw zone with bad class is handled ($n)"
|
|
ret=0
|
|
$CHECKZONE -f raw example zones/bad-badclass.raw > test.out.$n 2>&1 && ret=1
|
|
grep "failed: bad class" test.out.$n >/dev/null || ret=1
|
|
-n=`expr $n + 1`
|
|
+n=$((n+1))
|
|
if [ $ret != 0 ]; then echo_i "failed"; fi
|
|
-status=`expr $status + $ret`
|
|
+status=$((status+ret))
|
|
|
|
echo_i "checking that expirations that loop using serial arithmetic are handled ($n)"
|
|
ret=0
|
|
@@ -164,25 +164,25 @@ test $ret -eq 1 || $CHECKZONE $q dyn.example.net zones/crashzone.db || ret=1
|
|
test $ret -eq 1 || $CHECKZONE $q dyn.example.net zones/crashzone.db || ret=1
|
|
test $ret -eq 1 || $CHECKZONE $q dyn.example.net zones/crashzone.db || ret=1
|
|
test $ret -eq 1 || $CHECKZONE $q dyn.example.net zones/crashzone.db || ret=1
|
|
-n=`expr $n + 1`
|
|
+n=$((n+1))
|
|
if [ $ret != 0 ]; then echo_i "failed"; fi
|
|
-status=`expr $status + $ret`
|
|
+status=$((status+ret))
|
|
|
|
echo_i "checking that nameserver below DNAME is reported even with occulted address record present ($n)"
|
|
ret=0
|
|
$CHECKZONE example.com zones/ns-address-below-dname.db > test.out.$n 2>&1 && ret=1
|
|
grep "is below a DNAME" test.out.$n >/dev/null || ret=1
|
|
-n=`expr $n + 1`
|
|
+n=$((n+1))
|
|
if [ $ret != 0 ]; then echo_i "failed"; fi
|
|
-status=`expr $status + $ret`
|
|
+status=$((status+ret))
|
|
|
|
echo_i "checking that delegating nameserver below DNAME is reported even with occulted address record present ($n)"
|
|
ret=0
|
|
$CHECKZONE example.com zones/delegating-ns-address-below-dname.db > test.out.$n 2>&1 || ret=1
|
|
grep "is below a DNAME" test.out.$n >/dev/null || ret=1
|
|
-n=`expr $n + 1`
|
|
+n=$((n+1))
|
|
if [ $ret != 0 ]; then echo_i "failed"; fi
|
|
-status=`expr $status + $ret`
|
|
+status=$((status+ret))
|
|
|
|
echo_i "exit status: $status"
|
|
[ $status -eq 0 ] || exit 1
|
|
--
|
|
2.23.0
|
|
|