From 36d74bd2e327147e32321eebb2cfef07823ed07d Mon Sep 17 00:00:00 2001 From: Tom Krizek Date: Mon, 19 Jun 2023 16:30:46 +0200 Subject: [PATCH] Handle non-zero return codes in inline test --- bin/tests/system/inline/tests.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bin/tests/system/inline/tests.sh b/bin/tests/system/inline/tests.sh index b157d640c5..98ed178248 100755 --- a/bin/tests/system/inline/tests.sh +++ b/bin/tests/system/inline/tests.sh @@ -1113,9 +1113,9 @@ ret=0 $DIG $DIGOPTS bits. SOA @10.53.0.2 > dig.out.ns2.pre.test$n oldserial=$(awk '$4 == "SOA" { print $7 }' dig.out.ns2.pre.test$n) newserial=$($PERL -e 'while (<>) { chomp; my @field = split /\s+/; printf("%u\n", $field[6] + 10) if ($field[3] eq "SOA"); }' < dig.out.ns2.pre.test$n) -$RNDCCMD 10.53.0.2 freeze bits > /dev/null 2>&1 -$RNDCCMD 10.53.0.2 signing -serial ${newserial:-0} bits > /dev/null 2>&1 -$RNDCCMD 10.53.0.2 thaw bits > /dev/null 2>&1 +$RNDCCMD 10.53.0.2 freeze bits > /dev/null 2>&1 || ret=1 +$RNDCCMD 10.53.0.2 signing -serial ${newserial:-0} bits > /dev/null 2>&1 && ret=1 +$RNDCCMD 10.53.0.2 thaw bits > /dev/null 2>&1 || ret=1 retry_quiet 5 wait_for_serial 10.53.0.2 bits. "${newserial:-1}" dig.out.ns2.post1.test$n && ret=1 retry_quiet 5 wait_for_serial 10.53.0.2 bits. "${oldserial:-1}" dig.out.ns2.post2.test$n || ret=1 if [ $ret != 0 ]; then echo_i "failed"; fi