From: Mark Andrews <marka@isc.org>
Date: Thu, 16 Apr 2015 02:17:59 +0000 (+1000)
Subject: use awk for line count rather that wc -l which may space pad
X-Git-Tag: v9.11.0a1~871
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e834b30f7c91d3342c3c03494527682468e1c869;p=thirdparty%2Fbind9.git

use awk for line count rather that wc -l which may space pad
---

diff --git a/bin/tests/system/xfer/tests.sh b/bin/tests/system/xfer/tests.sh
index 89cb974f6b7..a07c85a3ac1 100644
--- a/bin/tests/system/xfer/tests.sh
+++ b/bin/tests/system/xfer/tests.sh
@@ -248,7 +248,7 @@ EOF
 
 $RNDCCMD reload | sed 's/^/I:ns4 /'
 
-cur=`wc -l < ns4/named.run`
+cur=`awk 'BEGIN {l=0} // {l++} END { print l }' ns4/named.run`
 
 for i in 0 1 2 3 4 5 6 7 8 9
 do
@@ -261,7 +261,7 @@ tail -n +"$cur" < ns4/named.run | grep "Transfer status: success" > /dev/null ||
     echo "I: failed: expected status was not logged"
     status=1
 }
-cur=`wc -l < ns4/named.run`
+cur=`awk 'BEGIN {l=0} // {l++} END { print l }' ns4/named.run`
 
 $DIGCMD nil. TXT | grep 'initial AXFR' >/dev/null || {
     echo "I:failed"
@@ -281,7 +281,7 @@ tail -n +"$cur" < ns4/named.run | grep "Transfer status: expected a TSIG or SIG(
     echo "I: failed: expected status was not logged"
     status=1
 }
-cur=`wc -l < ns4/named.run`
+cur=`awk 'BEGIN {l=0} // {l++} END { print l }' ns4/named.run`
 
 $DIGCMD nil. TXT | grep 'unsigned AXFR' >/dev/null && {
     echo "I:failed"
@@ -301,7 +301,7 @@ tail -n +"$cur" < ns4/named.run | grep "Transfer status: tsig verify failure" >
     echo "I: failed: expected status was not logged"
     status=1
 }
-cur=`wc -l < ns4/named.run`
+cur=`awk 'BEGIN {l=0} // {l++} END { print l }' ns4/named.run`
 
 $DIGCMD nil. TXT | grep 'bad keydata AXFR' >/dev/null && {
     echo "I:failed"
@@ -321,7 +321,7 @@ tail -n +"$cur" < ns4/named.run | grep "Transfer status: expected a TSIG or SIG(
     echo "I: failed: expected status was not logged"
     status=1
 }
-cur=`wc -l < ns4/named.run`
+cur=`awk 'BEGIN {l=0} // {l++} END { print l }' ns4/named.run`
 
 $DIGCMD nil. TXT | grep 'partially signed AXFR' >/dev/null && {
     echo "I:failed"
@@ -341,7 +341,7 @@ tail -n +"$cur" < ns4/named.run | grep "tsig key 'tsig_key': key name and algori
     echo "I: failed: expected status was not logged"
     status=1
 }
-cur=`wc -l < ns4/named.run`
+cur=`awk 'BEGIN {l=0} // {l++} END { print l }' ns4/named.run`
 
 $DIGCMD nil. TXT | grep 'unknown key AXFR' >/dev/null && {
     echo "I:failed"
@@ -361,7 +361,7 @@ tail -n +"$cur" < ns4/named.run | grep "tsig key 'tsig_key': key name and algori
     echo "I: failed: expected status was not logged"
     status=1
 }
-cur=`wc -l < ns4/named.run`
+cur=`awk 'BEGIN {l=0} // {l++} END { print l }' ns4/named.run`
 
 $DIGCMD nil. TXT | grep 'incorrect key AXFR' >/dev/null && {
     echo "I:failed"