From: Mark Andrews <marka@isc.org>
Date: Tue, 10 Dec 2019 03:53:00 +0000 (+1100)
Subject: suppress unnecessary zone transfer
X-Git-Tag: v9.14.10~5^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=28695f1c920daf73f3af4e014a71a8416069fff9;p=thirdparty%2Fbind9.git

suppress unnecessary zone transfer

suppressed unnecessary zone transfer in "test mapped zone with
out of zone data" sub-test.

(cherry picked from commit 9bd6720f581e5934c94cf7206c22a158f74c1902)
---

diff --git a/bin/tests/system/xfer/tests.sh b/bin/tests/system/xfer/tests.sh
index 524d6474f4d..b9fadaadb1c 100755
--- a/bin/tests/system/xfer/tests.sh
+++ b/bin/tests/system/xfer/tests.sh
@@ -431,14 +431,17 @@ fi
 n=`expr $n + 1`
 echo_i "test mapped zone with out of zone data ($n)"
 tmp=0
-$DIG -p ${PORT} txt mapped @10.53.0.3 > dig.out.1.$n
-grep "status: NOERROR," dig.out.1.$n > /dev/null || tmp=1
+$DIG -p ${PORT} txt mapped @10.53.0.3 > dig.out.1
+grep "status: NOERROR," dig.out.1 > /dev/null || tmp=1
 $PERL $SYSTEMTESTTOP/stop.pl xfer ns3
 $PERL $SYSTEMTESTTOP/start.pl --noclean --restart --port ${PORT} xfer ns3
-$DIG -p ${PORT} txt mapped @10.53.0.3 > dig.out.2.$n
-grep "status: NOERROR," dig.out.2.$n > /dev/null || tmp=1
-$DIG -p ${PORT} axfr mapped @10.53.0.3 > dig.out.3.$n
-digcomp knowngood.mapped dig.out.3.$n || tmp=1
+$DIG -p ${PORT} txt mapped @10.53.0.3 > dig.out.2
+grep "status: NOERROR," dig.out.2 > /dev/null || tmp=1
+if [ "$tmp" -eq 0 ]
+then
+	$DIG -p ${PORT} axfr mapped @10.53.0.3 > dig.out.3
+	digcomp knowngood.mapped dig.out.3 || tmp=1
+fi
 if test $tmp != 0 ; then echo_i "failed"; fi
 status=`expr $status + $tmp`