From: Tom Krizek <tkrizek@isc.org>
Date: Thu, 22 Jun 2023 16:08:03 +0000 (+0200)
Subject: Handle non-zero return codes in dnstap test
X-Git-Tag: v9.19.16~45^2~7
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9d383dce401878c860f44ffcb69df5cb0d668343;p=thirdparty%2Fbind9.git

Handle non-zero return codes in dnstap test
---

diff --git a/bin/tests/system/dnstap/tests.sh b/bin/tests/system/dnstap/tests.sh
index c7965445d02..75bfbfcc92e 100644
--- a/bin/tests/system/dnstap/tests.sh
+++ b/bin/tests/system/dnstap/tests.sh
@@ -554,7 +554,7 @@ if [ -n "$FSTRM_CAPTURE" ] ; then
 	$DIG $DIGOPTS @10.53.0.4 a.example > dig.out
 
 	# send an UPDATE to ns4
-	$NSUPDATE <<- EOF > nsupdate.out 2>&1
+	$NSUPDATE <<- EOF > nsupdate.out 2>&1 && ret=1
 	server 10.53.0.4 ${PORT}
 	zone example
 	update add b.example 3600 in a 10.10.10.10
@@ -806,7 +806,7 @@ _test_dnstap_roll() (
 
     $RNDCCMD -s "${ip}" dnstap -roll "${n}" | sed "s/^/${ns} /" | cat_i &&
     files=$(find "$ns" -name "dnstap.out.[0-9]" | wc -l) &&
-    test "$files" -eq "${n}" && test "$files" -ge "1"
+    test "$files" -eq "${n}" && test "$files" -ge "1" || return 1
 )