From: Evan Hunt <each@isc.org>
Date: Wed, 23 Jan 2019 08:52:21 +0000 (-0800)
Subject: fix rndc test
X-Git-Tag: v9.13.6~36^2~8
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=a77b6a8abcc58e180098de17c718bb32016a363b;p=thirdparty%2Fbind9.git

fix rndc test

use regex instead of exact string matching to deal with CR at end of line
---

diff --git a/bin/tests/system/rndc/tests.sh b/bin/tests/system/rndc/tests.sh
index b9dda3827ed..7cbe2c7338a 100644
--- a/bin/tests/system/rndc/tests.sh
+++ b/bin/tests/system/rndc/tests.sh
@@ -227,7 +227,7 @@ do
 	grep "addition 6" ns2/other.db > /dev/null && break
 	sleep 1
 done
-serial=`awk '$3 == "serial" {print $1}' ns2/other.db`
+serial=`awk '$3 ~ /serial/ {print $1}' ns2/other.db`
 newserial=`expr $serial + 1`
 sed s/$serial/$newserial/ ns2/other.db > ns2/other.db.new
 echo 'frozen TXT "frozen addition"' >> ns2/other.db.new
@@ -270,7 +270,7 @@ do
 	grep "addition 6" ns2/nil.db > /dev/null && break
 	sleep 1
 done
-serial=`awk '$3 == "serial" {print $1}' ns2/nil.db`
+serial=`awk '$3 ~ /serial/ {print $1}' ns2/nil.db`
 newserial=`expr $serial + 1`
 sed s/$serial/$newserial/ ns2/nil.db > ns2/nil.db.new
 echo 'frozen TXT "frozen addition"' >> ns2/nil.db.new