From: Tom Krizek <tkrizek@isc.org>
Date: Mon, 13 Mar 2023 14:16:35 +0000 (+0100)
Subject: End dupsigs test early if it fails
X-Git-Tag: v9.19.12~71^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ad647dca13216a886be8803c9fd46307ad3aabdf;p=thirdparty%2Fbind9.git

End dupsigs test early if it fails

There's no point in continuing the dupsigs test if a failure is
detected. End the test early to avoid wasting time and resources.
---

diff --git a/bin/tests/system/dupsigs/tests.sh b/bin/tests/system/dupsigs/tests.sh
index 4693b01e716..f5dbf69c401 100644
--- a/bin/tests/system/dupsigs/tests.sh
+++ b/bin/tests/system/dupsigs/tests.sh
@@ -30,13 +30,14 @@ fully_signed () {
              $4 == "RRSIG" {lines++}
              END { if (lines != 1008) exit(1) }' < "dig.out.ns1.axfr"
 }
-retry_quiet 30 fully_signed || ret=1
+retry_quiet 30 fully_signed || status=1
+if [ $status != 0 ]; then echo_i "failed"; fi
 
 start=`date +%s`
 now=$start
 end=$((start + 140))
 
-while [ $now -lt $end ]; do
+while [ $now -lt $end ] && [ $status -eq 0 ]; do
         et=$((now - start))
 	echo_i "............... $et ............"
 	$JOURNALPRINT ns1/signing.test.db.signed.jnl | $PERL check_journal.pl | cat_i