From e7ec2cea481b7c6bf364ddb006fe36964f639554 Mon Sep 17 00:00:00 2001 From: Tom Krizek Date: Mon, 19 Jun 2023 16:42:51 +0200 Subject: [PATCH] Handle non-zero return codes in redirect test (cherry picked from commit 45fc4cc465845ae1c1303699bba3ba4bd7459715) --- bin/tests/system/redirect/tests.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bin/tests/system/redirect/tests.sh b/bin/tests/system/redirect/tests.sh index 82d413fd0f..4e81bd721c 100644 --- a/bin/tests/system/redirect/tests.sh +++ b/bin/tests/system/redirect/tests.sh @@ -54,11 +54,11 @@ status=$((status + ret)) echo_i "checking A zone redirect updates statistics ($n)" ret=0 -rm ns2/named.stats 2>/dev/null +rm -f ns2/named.stats 2>/dev/null $RNDCCMD 10.53.0.2 stats || ret=1 PRE=`sed -n -e "s/[ ]*\([0-9]*\).queries resulted in NXDOMAIN that were redirected$/\1/p" ns2/named.stats` $DIG $DIGOPTS nonexist. @10.53.0.2 -b 10.53.0.2 a > dig.out.ns2.test$n || ret=1 -rm ns2/named.stats 2>/dev/null +rm -f ns2/named.stats 2>/dev/null $RNDCCMD 10.53.0.2 stats || ret=1 POST=`sed -n -e "s/[ ]*\([0-9]*\).queries resulted in NXDOMAIN that were redirected$/\1/p" ns2/named.stats` if [ $((POST - PRE)) != 1 ]; then ret=1; fi @@ -384,7 +384,7 @@ status=$((status + ret)) echo_i "checking AAAA nxdomain-redirect works for nonexist ($n)" ret=0 -rm ns4/named.stats 2>/dev/null +rm -f ns4/named.stats 2>/dev/null $RNDCCMD 10.53.0.4 stats || ret=1 PRE_RED=`sed -n -e "s/[ ]*\([0-9]*\).queries resulted in NXDOMAIN that were redirected$/\1/p" ns4/named.stats` PRE_SUC=`sed -n -e "s/[ ]*\([0-9]*\).queries resulted in NXDOMAIN that were redirected and resulted in a successful remote lookup$/\1/p" ns4/named.stats` @@ -397,7 +397,7 @@ status=$((status + ret)) echo_i "checking AAAA nxdomain-redirect updates statistics ($n)" ret=0 -rm ns4/named.stats 2>/dev/null +rm -f ns4/named.stats 2>/dev/null $RNDCCMD 10.53.0.4 stats || ret=1 POST_RED=`sed -n -e "s/[ ]*\([0-9]*\).queries resulted in NXDOMAIN that were redirected$/\1/p" ns4/named.stats` POST_SUC=`sed -n -e "s/[ ]*\([0-9]*\).queries resulted in NXDOMAIN that were redirected and resulted in a successful remote lookup$/\1/p" ns4/named.stats`