From 2ae3c97599d419f59b850a0c17f445d304465286 Mon Sep 17 00:00:00 2001 From: Evan Hunt Date: Tue, 22 Jan 2019 21:06:48 -0800 Subject: [PATCH] fix inline test use regex instead of exact string matching, to deal with CR at end of ine --- bin/tests/system/inline/tests.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/tests/system/inline/tests.sh b/bin/tests/system/inline/tests.sh index 15a2c012dc..12c0926b24 100755 --- a/bin/tests/system/inline/tests.sh +++ b/bin/tests/system/inline/tests.sh @@ -635,7 +635,7 @@ echo_i "checking rndc freeze/thaw of dynamic inline zone ($n)" ret=0 $RNDCCMD 10.53.0.3 freeze dynamic > freeze.test$n 2>&1 || ret=1 sleep 1 -awk '$2 == ";" && $3 == "serial" { printf("%d %s %s\n", $1 + 1, $2, $3); next; } +awk '$2 == ";" && $3 ~ /serial/ { printf("%d %s %s\n", $1 + 1, $2, $3); next; } { print; } END { print "freeze1.dynamic. 0 TXT freeze1"; } ' ns3/dynamic.db > ns3/dynamic.db.new mv ns3/dynamic.db.new ns3/dynamic.db @@ -665,7 +665,7 @@ echo_i "checking rndc freeze/thaw of server ($n)" ret=0 $RNDCCMD 10.53.0.3 freeze > freeze.test$n 2>&1 || ret=1 sleep 1 -awk '$2 == ";" && $3 == "serial" { printf("%d %s %s\n", $1 + 1, $2, $3); next; } +awk '$2 == ";" && $3 ~ /serial/ { printf("%d %s %s\n", $1 + 1, $2, $3); next; } { print; } END { print "freeze2.dynamic. 0 TXT freeze2"; } ' ns3/dynamic.db > ns3/dynamic.db.new mv ns3/dynamic.db.new ns3/dynamic.db