From 879c63b5739e8d3423da69e28bddc7b07b04441c Mon Sep 17 00:00:00 2001
From: Mark Andrews <marka@isc.org>
Date: Thu, 6 Feb 2020 14:10:15 +1100
Subject: [PATCH 1/5] remove space from before 'failed'; count errors

---
 bin/tests/system/additional/tests.sh | 52 ++++++++++++++--------------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/bin/tests/system/additional/tests.sh b/bin/tests/system/additional/tests.sh
index 40642869b1..51c09fc99d 100644
--- a/bin/tests/system/additional/tests.sh
+++ b/bin/tests/system/additional/tests.sh
@@ -24,7 +24,7 @@ dotests() {
     ret=0
     $DIG $DIGOPTS +rec -t RT rt.rt.example @10.53.0.1 > dig.out.$n || ret=1
     if [ $ret -eq 1 ] ; then
-            echo_i " failed"; status=1
+            echo_i "failed"; status=$((status+1))
     fi
 
     n=`expr $n + 1`
@@ -32,7 +32,7 @@ dotests() {
     ret=0
     $DIG $DIGOPTS +rec -t RT rt.rt2.example @10.53.0.1 > dig.out.$n || ret=1
     if [ $ret -eq 1 ] ; then
-            echo_i " failed"; status=1
+            echo_i "failed"; status=$((status+1))
     fi
 
     n=`expr $n + 1`
@@ -40,7 +40,7 @@ dotests() {
     ret=0
     $DIG $DIGOPTS +rec -t NAPTR nap.naptr.example @10.53.0.1 > dig.out.$n || ret=1
     if [ $ret -eq 1 ] ; then
-            echo_i " failed"; status=1
+            echo_i "failed"; status=$((status+1))
     fi
 
     n=`expr $n + 1`
@@ -48,7 +48,7 @@ dotests() {
     ret=0
     $DIG $DIGOPTS +rec -t NAPTR nap.hang3b.example @10.53.0.1 > dig.out.$n || ret=1
     if [ $ret -eq 1 ] ; then
-            echo_i " failed"; status=1
+            echo_i "failed"; status=$((status+1))
     fi
 
     n=`expr $n + 1`
@@ -78,7 +78,7 @@ dotests() {
       ;;
     esac
     if [ $ret -eq 1 ] ; then
-            echo_i " failed"; status=1
+            echo_i "failed"; status=$((status+1))
     fi
 
     n=`expr $n + 1`
@@ -94,7 +94,7 @@ dotests() {
       grep -w "L32" dig.out.$n > /dev/null && ret=1
     fi
     if [ $ret -eq 1 ] ; then
-            echo_i " failed"; status=1
+            echo_i "failed"; status=$((status+1))
     fi
 
     n=`expr $n + 1`
@@ -112,7 +112,7 @@ dotests() {
       grep -w "L32" dig.out.$n > /dev/null && ret=1
     fi
     if [ $ret -eq 1 ] ; then
-            echo_i " failed"; status=1
+            echo_i "failed"; status=$((status+1))
     fi
 
     n=`expr $n + 1`
@@ -120,7 +120,7 @@ dotests() {
     ret=0
     $DIG $DIGOPTS +norec -t RT rt.rt.example @10.53.0.1 > dig.out.$n || ret=1
     if [ $ret -eq 1 ] ; then
-            echo_i " failed"; status=1
+            echo_i "failed"; status=$((status+1))
     fi
 
     n=`expr $n + 1`
@@ -128,7 +128,7 @@ dotests() {
     ret=0
     $DIG $DIGOPTS +norec -t RT rt.rt2.example @10.53.0.1 > dig.out.$n || ret=1
     if [ $ret -eq 1 ] ; then
-            echo_i " failed"; status=1
+            echo_i "failed"; status=$((status+1))
     fi
 
     n=`expr $n + 1`
@@ -136,7 +136,7 @@ dotests() {
     ret=0
     $DIG $DIGOPTS +norec -t NAPTR nap.naptr.example @10.53.0.1 > dig.out.$n || ret=1
     if [ $ret -eq 1 ] ; then
-            echo_i " failed"; status=1
+            echo_i "failed"; status=$((status+1))
     fi
 
     n=`expr $n + 1`
@@ -144,7 +144,7 @@ dotests() {
     ret=0
     $DIG $DIGOPTS +norec -t NAPTR nap.hang3b.example @10.53.0.1 > dig.out.$n || ret=1
     if [ $ret -eq 1 ] ; then
-            echo_i " failed"; status=1
+            echo_i "failed"; status=$((status+1))
     fi
 
     n=`expr $n + 1`
@@ -174,7 +174,7 @@ dotests() {
       ;;
     esac
     if [ $ret -eq 1 ] ; then
-            echo_i " failed"; status=1
+            echo_i "failed"; status=$((status+1))
     fi
 
     n=`expr $n + 1`
@@ -190,7 +190,7 @@ dotests() {
       grep -w "L32" dig.out.$n > /dev/null && ret=1
     fi
     if [ $ret -eq 1 ] ; then
-            echo_i " failed"; status=1
+            echo_i "failed"; status=$((status+1))
     fi
 
     n=`expr $n + 1`
@@ -208,7 +208,7 @@ dotests() {
       grep -w "L32" dig.out.$n > /dev/null && ret=1
     fi
     if [ $ret -eq 1 ] ; then
-            echo_i " failed"; status=1
+            echo_i "failed"; status=$((status+1))
     fi
 
     n=`expr $n + 1`
@@ -218,7 +218,7 @@ dotests() {
     # Always expect glue for root priming queries, regardless $minimal
     grep 'ADDITIONAL: 3' dig.out.$n > /dev/null || ret=1
     if [ $ret -eq 1 ] ; then
-            echo_i " failed"; status=1
+            echo_i "failed"; status=$((status+1))
     fi
 
     n=`expr $n + 1`
@@ -240,7 +240,7 @@ dotests() {
       ;;
     esac
     if [ $ret -eq 1 ] ; then
-            echo_i " failed"; status=1
+            echo_i "failed"; status=$((status+1))
     fi
 }
 
@@ -262,7 +262,7 @@ ret=0
 $DIG $DIGOPTS -t ANY www.rt.example @10.53.0.1 > dig.out.$n || ret=1
 grep "ANSWER: 3, AUTHORITY: 2, ADDITIONAL: 2" dig.out.$n > /dev/null || ret=1
 if [ $ret -eq 1 ] ; then
-    echo_i " failed"; status=1
+    echo_i "failed"; status=$((status+1))
 fi
 
 echo_i "reconfiguring server: minimal-any yes"
@@ -275,7 +275,7 @@ ret=0
 $DIG $DIGOPTS -t ANY +notcp www.rt.example @10.53.0.1 > dig.out.$n || ret=1
 grep "ANSWER: 1, AUTHORITY: 0, ADDITIONAL: 1" dig.out.$n > /dev/null || ret=1
 if [ $ret -eq 1 ] ; then
-    echo_i " failed"; status=1
+    echo_i "failed"; status=$((status+1))
 fi
 n=`expr $n + 1`
 
@@ -284,7 +284,7 @@ ret=0
 $DIG $DIGOPTS -t ANY +tcp www.rt.example @10.53.0.1 > dig.out.$n || ret=1
 grep "ANSWER: 3, AUTHORITY: 0, ADDITIONAL: 1" dig.out.$n > /dev/null || ret=1
 if [ $ret -eq 1 ] ; then
-    echo_i " failed"; status=1
+    echo_i "failed"; status=$((status+1))
 fi
 
 n=`expr $n + 1`
@@ -293,7 +293,7 @@ ret=0
 $DIG $DIGOPTS -t ANY +notcp www.rt.example @10.53.0.1 > dig.out.$n || ret=1
 grep "ANSWER: 1, AUTHORITY: 0, ADDITIONAL: 1" dig.out.$n > /dev/null || ret=1
 if [ $ret -eq 1 ] ; then
-    echo_i " failed"; status=1
+    echo_i "failed"; status=$((status+1))
 fi
 
 echo_i "testing with 'minimal-responses no-auth;'"
@@ -316,7 +316,7 @@ grep "mx\.example\..*MX.0 mail\.mx\.example" dig.out.$n > /dev/null || ret=1
 grep "mail\.mx\.example\..*A.1\.2\.3\.4" dig.out.$n > /dev/null || ret=1
 grep "_25\._tcp\.mail\.mx\.example\..*TLSA.3 0 1 5B30F9602297D558EB719162C225088184FAA32CA45E1ED15DE58A21 D9FCE383" dig.out.$n > /dev/null || ret=1
 if [ $ret -eq 1 ] ; then
-    echo_i " failed"; status=1
+    echo_i "failed"; status=$((status+1))
 fi
 
 n=`expr $n + 1`
@@ -327,7 +327,7 @@ grep "_xmpp-client\._tcp\.srv\.example\..*SRV.1 0 5222 server\.srv\.example" dig
 grep "server\.srv\.example\..*A.1\.2\.3\.4" dig.out.$n > /dev/null || ret=1
 grep "_5222\._tcp\.server\.srv\.example\..*TLSA.3 0 1 5B30F9602297D558EB719162C225088184FAA32CA45E1ED15DE58A21 D9FCE383" dig.out.$n > /dev/null || ret=1
 if [ $ret -eq 1 ] ; then
-    echo_i " failed"; status=1
+    echo_i "failed"; status=$((status+1))
 fi
 
 echo_i "reconfiguring server: minimal-responses no"
@@ -341,7 +341,7 @@ $DIG $DIGOPTS -t ANY rt.example @10.53.0.1 > dig.out.$n || ret=1
 grep "AUTHORITY: 0" dig.out.$n  > /dev/null || ret=1
 grep "NS[ 	]*ns" dig.out.$n  > /dev/null || ret=1
 if [ $ret -eq 1 ] ; then
-    echo_i " failed"; status=1
+    echo_i "failed"; status=$((status+1))
 fi
 
 n=`expr $n + 1`
@@ -351,7 +351,7 @@ $DIG $DIGOPTS -t ANY rt.example @10.53.0.3 > dig.out.$n || ret=1
 grep "AUTHORITY: 0" dig.out.$n  > /dev/null || ret=1
 grep "NS[ 	]*ns" dig.out.$n  > /dev/null || ret=1
 if [ $ret -eq 1 ] ; then
-    echo_i " failed"; status=1
+    echo_i "failed"; status=$((status+1))
 fi
 
 n=`expr $n + 1`
@@ -360,7 +360,7 @@ ret=0
 $DIG $DIGOPTS -t NS rt.example @10.53.0.1 > dig.out.$n || ret=1
 grep "ADDITIONAL: 2" dig.out.$n  > /dev/null || ret=1
 if [ $ret -eq 1 ] ; then
-    echo_i " failed"; status=1
+    echo_i "failed"; status=$((status+1))
 fi
 
 n=`expr $n + 1`
@@ -369,7 +369,7 @@ ret=0
 $DIG $DIGOPTS -t NS ex @10.53.0.3 > dig.out.$n || ret=1
 grep "ADDITIONAL: 3" dig.out.$n  > /dev/null || ret=1
 if [ $ret -eq 1 ] ; then
-    echo_i " failed"; status=1
+    echo_i "failed"; status=$((status+1))
 fi
 
 echo_i "exit status: $status"

From 059b16b9910fa1843f2d837ac6cafee1030fc81d Mon Sep 17 00:00:00 2001
From: Mark Andrews <marka@isc.org>
Date: Thu, 6 Feb 2020 14:12:31 +1100
Subject: [PATCH 2/5] ident continuation of test descriptions

---
 bin/tests/system/autosign/tests.sh | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/bin/tests/system/autosign/tests.sh b/bin/tests/system/autosign/tests.sh
index 279da23b22..425d015e61 100755
--- a/bin/tests/system/autosign/tests.sh
+++ b/bin/tests/system/autosign/tests.sh
@@ -195,8 +195,8 @@ nextpartreset ns3/named.run
 # Check that DNSKEY is initially signed with a KSK and not a ZSK.
 #
 echo_i "check that zone with active and inactive KSK and active ZSK is properly"
-echo_i "  resigned after the active KSK is deleted - stage 1: Verify that DNSKEY"
-echo_i "  is initially signed with a KSK and not a ZSK. ($n)"
+echo_ic "resigned after the active KSK is deleted - stage 1: Verify that DNSKEY"
+echo_ic "is initially signed with a KSK and not a ZSK. ($n)"
 ret=0
 
 $DIG $DIGOPTS @10.53.0.3 axfr inacksk3.example > dig.out.ns3.test$n
@@ -232,8 +232,8 @@ status=`expr $status + $ret`
 # Check that zone is initially signed with a ZSK and not a KSK.
 #
 echo_i "check that zone with active and inactive ZSK and active KSK is properly"
-echo_i "  resigned after the active ZSK is deleted - stage 1: Verify that zone"
-echo_i "  is initially signed with a ZSK and not a KSK. ($n)"
+echo_ic "resigned after the active ZSK is deleted - stage 1: Verify that zone"
+echo_ic "is initially signed with a ZSK and not a KSK. ($n)"
 ret=0
 $DIG $DIGOPTS @10.53.0.3 axfr inaczsk3.example > dig.out.ns3.test$n
 kskid=`awk '$4 == "DNSKEY" && $5 == 257 { print }' dig.out.ns3.test$n |
@@ -1478,8 +1478,8 @@ status=`expr $status + $ret`
 # Check that DNSKEY is now signed with the ZSK.
 #
 echo_i "check that zone with active and inactive KSK and active ZSK is properly"
-echo_i "  resigned after the active KSK is deleted - stage 2: Verify that DNSKEY"
-echo_i "  is now signed with the ZSK. ($n)"
+echo_ic "resigned after the active KSK is deleted - stage 2: Verify that DNSKEY"
+echo_ic "is now signed with the ZSK. ($n)"
 ret=0
 
 $DIG $DIGOPTS @10.53.0.3 axfr inacksk3.example > dig.out.ns3.test$n
@@ -1507,8 +1507,8 @@ status=`expr $status + $ret`
 # Check that zone is now signed with the KSK.
 #
 echo_i "check that zone with active and inactive ZSK and active KSK is properly"
-echo_i "  resigned after the active ZSK is deleted - stage 2: Verify that zone"
-echo_i "  is now signed with the KSK. ($n)"
+echo_ic "resigned after the active ZSK is deleted - stage 2: Verify that zone"
+echo_ic "is now signed with the KSK. ($n)"
 ret=0
 $DIG $DIGOPTS @10.53.0.3 axfr inaczsk3.example > dig.out.ns3.test$n
 kskid=`awk '$4 == "DNSKEY" && $5 == 257 { print }' dig.out.ns3.test$n |

From 0d5ec0c7dc68541b8688039acbcaddf4f22f4ae3 Mon Sep 17 00:00:00 2001
From: Mark Andrews <marka@isc.org>
Date: Thu, 6 Feb 2020 14:13:02 +1100
Subject: [PATCH 3/5] remove space before 'failed'

---
 bin/tests/system/chain/tests.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/tests/system/chain/tests.sh b/bin/tests/system/chain/tests.sh
index bfa81d8248..f05b2f2f88 100644
--- a/bin/tests/system/chain/tests.sh
+++ b/bin/tests/system/chain/tests.sh
@@ -158,7 +158,7 @@ ret=0
 $RNDCCMD 10.53.0.7 null --- start test$n --- 2>&1 | sed 's/^/ns7 /' | cat_i
 $DIG $DIGOPTS @10.53.0.7 c.example > dig.out.$n
 grep "status: NOERROR" dig.out.$n > /dev/null || ret=1
-if [ $ret != 0 ]; then echo_i " failed"; fi
+if [ $ret != 0 ]; then echo_i "failed"; fi
 status=`expr $status + $ret`
 
 n=`expr $n + 1`
@@ -167,7 +167,7 @@ ret=0
 $RNDCCMD 10.53.0.7 null --- start test$n --- 2>&1 | sed 's/^/ns7 /' | cat_i
 $DIG $DIGOPTS @10.53.0.7 d.example > dig.out.$n
 grep "status: NOERROR" dig.out.$n > /dev/null || ret=1
-if [ $ret != 0 ]; then echo_i " failed"; fi
+if [ $ret != 0 ]; then echo_i "failed"; fi
 status=`expr $status + $ret`
 
 n=`expr $n + 1`

From ec95bc6f2c8e0d4c211f9c7feb761a100681d098 Mon Sep 17 00:00:00 2001
From: Mark Andrews <marka@isc.org>
Date: Thu, 6 Feb 2020 14:16:30 +1100
Subject: [PATCH 4/5] indent some test descriptions/continuation

---
 bin/tests/system/dnssec/tests.sh | 24 ++++++++++++------------
 bin/tests/system/ixfr/tests.sh   | 26 +++++++++++++++-----------
 2 files changed, 27 insertions(+), 23 deletions(-)

diff --git a/bin/tests/system/dnssec/tests.sh b/bin/tests/system/dnssec/tests.sh
index ca5b09acf8..39db3e7b9c 100644
--- a/bin/tests/system/dnssec/tests.sh
+++ b/bin/tests/system/dnssec/tests.sh
@@ -1289,7 +1289,7 @@ test "$ret" -eq 0 || echo_i "failed"
 status=$((status+ret))
 
 echo_i "basic dnssec-signzone checks:"
-echo_i " two DNSKEYs ($n)"
+echo_ic "two DNSKEYs ($n)"
 ret=0
 (
 cd signer/general || exit 1
@@ -1301,7 +1301,7 @@ n=$((n+1))
 test "$ret" -eq 0 || echo_i "failed"
 status=$((status+ret))
 
-echo_i " one non-KSK DNSKEY ($n)"
+echo_ic "one non-KSK DNSKEY ($n)"
 ret=0
 (
 cd signer/general || exit 1
@@ -1313,7 +1313,7 @@ n=$((n+1))
 test "$ret" -eq 0 || echo_i "failed"
 status=$((status+ret))
 
-echo_i " one KSK DNSKEY ($n)"
+echo_ic "one KSK DNSKEY ($n)"
 ret=0
 (
 cd signer/general || exit 1
@@ -1325,7 +1325,7 @@ n=$((n+1))
 test "$ret" -eq 0 || echo_i "failed"
 status=$((status+ret))
 
-echo_i " three DNSKEY ($n)"
+echo_ic "three DNSKEY ($n)"
 ret=0
 (
 cd signer/general || exit 1
@@ -1337,7 +1337,7 @@ n=$((n+1))
 test "$ret" -eq 0 || echo_i "failed"
 status=$((status+ret))
 
-echo_i " three DNSKEY, one private key missing ($n)"
+echo_ic "three DNSKEY, one private key missing ($n)"
 ret=0
 (
 cd signer/general || exit 1
@@ -1349,7 +1349,7 @@ n=$((n+1))
 test "$ret" -eq 0 || echo_i "failed"
 status=$((status+ret))
 
-echo_i " four DNSKEY ($n)"
+echo_ic "four DNSKEY ($n)"
 ret=0
 (
 cd signer/general || exit 1
@@ -1361,7 +1361,7 @@ n=$((n+1))
 test "$ret" -eq 0 || echo_i "failed"
 status=$((status+ret))
 
-echo_i " two DNSKEY, both private keys missing ($n)"
+echo_ic "two DNSKEY, both private keys missing ($n)"
 ret=0
 (
 cd signer/general || exit 1
@@ -1373,7 +1373,7 @@ n=$((n+1))
 test "$ret" -eq 0 || echo_i "failed"
 status=$((status+ret))
 
-echo_i " two DNSKEY, one private key missing ($n)"
+echo_ic "two DNSKEY, one private key missing ($n)"
 ret=0
 (
 cd signer/general || exit 1
@@ -3358,7 +3358,7 @@ test "$ret" -eq 0 || echo_i "failed"
 status=$((status+ret))
 
 echo_i "check that CDS records are signed only using KSK when added by"
-echo_i "   nsupdate when dnssec-dnskey-kskonly is yes ($n)"
+echo_ic "nsupdate when dnssec-dnskey-kskonly is yes ($n)"
 ret=0
 keyid=$(cat ns2/cds-kskonly.secure.id)
 (
@@ -3384,7 +3384,7 @@ test "$ret" -eq 0 || echo_i "failed"
 status=$((status+ret))
 
 echo_i "check that CDS deletion records are signed only using KSK when added by"
-echo_i "   nsupdate when dnssec-dnskey-kskonly is yes ($n)"
+echo_ic "nsupdate when dnssec-dnskey-kskonly is yes ($n)"
 ret=0
 keyid=$(cat ns2/cds-kskonly.secure.id)
 (
@@ -3591,7 +3591,7 @@ test "$ret" -eq 0 || echo_i "failed"
 status=$((status+ret))
 
 echo_i "check that CDNSKEY records are signed only using KSK when added by"
-echo_i "   nsupdate when dnssec-dnskey-kskonly is yes ($n)"
+echo_ic "nsupdate when dnssec-dnskey-kskonly is yes ($n)"
 ret=0
 keyid=$(cat ns2/cdnskey-kskonly.secure.id)
 (
@@ -3614,7 +3614,7 @@ test "$ret" -eq 0 || echo_i "failed"
 status=$((status+ret))
 
 echo_i "check that CDNSKEY deletion records are signed only using KSK when added by"
-echo_i "   nsupdate when dnssec-dnskey-kskonly is yes ($n)"
+echo_ic "nsupdate when dnssec-dnskey-kskonly is yes ($n)"
 ret=0
 keyid=$(cat ns2/cdnskey-kskonly.secure.id)
 (
diff --git a/bin/tests/system/ixfr/tests.sh b/bin/tests/system/ixfr/tests.sh
index e14fbc028c..c07251d4d0 100644
--- a/bin/tests/system/ixfr/tests.sh
+++ b/bin/tests/system/ixfr/tests.sh
@@ -206,7 +206,7 @@ echo_i "testing request-ixfr option in view vs zone ($n)"
 # we want to make sure that a change to sub.test results in AXFR, while
 # changes to test. result in IXFR
 
-echo_i " this result should be AXFR"
+echo_ic "this result should be AXFR"
 cp ns3/subtest1.db ns3/subtest.db # change to sub.test zone, should be AXFR
 $RNDCCMD 10.53.0.3 reload | sed 's/^/ns3 /' | cat_i
 
@@ -231,7 +231,7 @@ do
 	sleep 1
 done
 
-echo_i " this result should be AXFR"
+echo_ic "this result should be AXFR"
 for i in 0 1 2 3 4 5 6 7 8 9
 do
 	NONINCR=`grep 'sub\.test/IN/primary' ns4/named.run|grep "got nonincremental" | wc -l`
@@ -240,13 +240,15 @@ do
 done
 if [ $NONINCR -ne 2 ]
 then
-    echo_i "failed to get nonincremental response in 2nd AXFR test"
+    echo_ic "failed to get nonincremental response in 2nd AXFR test"
+
+    echo_i "failed"
     status=1
 else
-    echo_i "  success: AXFR it was"
+    echo_ic "success: AXFR it was"
 fi
 
-echo_i " this result should be IXFR"
+echo_ic "this result should be IXFR"
 cp ns3/mytest2.db ns3/mytest.db # change to test zone, should be IXFR
 $RNDCCMD 10.53.0.3 reload | sed 's/^/ns3 /' | cat_i
 
@@ -279,10 +281,12 @@ do
 done
 if [ $INCR -ne 2 ]
 then
-    echo_i "failed to get incremental response in 2nd IXFR test"
+    echo_ic "failed to get incremental response in 2nd IXFR test"
+
+    echo_i "failed"
     status=1
 else
-    echo_i "  success: IXFR it was"
+    echo_ic "success: IXFR it was"
 fi
 
 n=$((n+1))
@@ -311,8 +315,8 @@ awk '$4 == "SOA" { if ($7 == 4) exit(0); else exit(1);}' dig.out1.test$n || ret=
 $DIG $DIGOPTS ixfr=1 test @10.53.0.4 > dig.out3.test$n || ret=1
 awk '$4 == "SOA" { soacnt++} END { if (soacnt == 6) exit(0); else exit(1);}' dig.out3.test$n || ret=1
 if [ ${ret} != 0 ]; then
-	echo_i "failed";
-	status=1;
+	echo_i "failed"
+	status=1
 fi
 
 # wait for slave to transfer zone
@@ -338,8 +342,8 @@ $DIG $DIGOPTS ixfr=1 +notcp test @10.53.0.5 > dig.out2.test$n || ret=1
 awk '$4 == "SOA" { soacnt++} END {if (soacnt == 2) exit(0); else exit(1);}' dig.out1.test$n || ret=1
 awk '$4 == "SOA" { soacnt++} END {if (soacnt == 1) exit(0); else exit(1);}' dig.out2.test$n || ret=1
 if [ ${ret} != 0 ]; then
-	echo_i "failed";
-	status=1;
+	echo_i "failed"
+	status=1
 fi
 
 n=$((n+1))

From 1e4773f121689a917efcb340dd23de4a16f7c30c Mon Sep 17 00:00:00 2001
From: Mark Andrews <marka@isc.org>
Date: Thu, 6 Feb 2020 14:18:15 +1100
Subject: [PATCH 5/5] indent failed: descriptions

---
 bin/tests/system/rpzrecurse/tests.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/bin/tests/system/rpzrecurse/tests.sh b/bin/tests/system/rpzrecurse/tests.sh
index 11160cacdf..3679d35c8f 100644
--- a/bin/tests/system/rpzrecurse/tests.sh
+++ b/bin/tests/system/rpzrecurse/tests.sh
@@ -415,15 +415,15 @@ for mode in native dnsrps; do
   $DIG $DIGOPTS l2.l1.l0 a @10.53.0.2 -p ${PORT} -b 10.53.0.3 >> dig.out.${t}
   $DIG $DIGOPTS l2.l1.l0 a @10.53.0.2 -p ${PORT} -b 10.53.0.2 >> dig.out.${t}
   sed -n "$cur,"'$p' < ns2/named.run | grep "view recursive: rpz CLIENT-IP Local-Data rewrite l2.l1.l0/A/IN via 32.4.0.53.10.rpz-client-ip.log1" > /dev/null && {
-    echo_i " failed: unexpected rewrite message for policy zone log1 was logged"
+    echo_ic "failed: unexpected rewrite message for policy zone log1 was logged"
     status=1
   }
   sed -n "$cur,"'$p' < ns2/named.run | grep "view recursive: rpz CLIENT-IP Local-Data rewrite l2.l1.l0/A/IN via 32.3.0.53.10.rpz-client-ip.log2" > /dev/null || {
-    echo_i " failed: expected rewrite message for policy zone log2 was not logged"
+    echo_ic "failed: expected rewrite message for policy zone log2 was not logged"
     status=1
   }
   sed -n "$cur,"'$p' < ns2/named.run | grep "view recursive: rpz CLIENT-IP Local-Data rewrite l2.l1.l0/A/IN via 32.2.0.53.10.rpz-client-ip.log3" > /dev/null || {
-    echo_i " failed: expected rewrite message for policy zone log3 was not logged"
+    echo_ic "failed: expected rewrite message for policy zone log3 was not logged"
     status=1
   }
 
@@ -480,7 +480,7 @@ for mode in native dnsrps; do
   add_test_marker 10.53.0.2
   run_server invalidprefixlength
   grep "invalid rpz IP address \"1000.4.0.53.10.rpz-client-ip.invalidprefixlength\"; invalid prefix length of 1000$" ns2/named.run > /dev/null || {
-    echo_i " failed: expected that invalid prefix length error would be logged"
+    echo_ic "failed: expected that invalid prefix length error would be logged"
     status=1
   }