From: Mark Andrews <marka@isc.org>
Date: Wed, 19 Sep 2018 05:25:54 +0000 (+1000)
Subject: qmin: fix 'query for .ugly fails when qname-minimization is in strict mode'; remove... 
X-Git-Tag: v9.13.4~105^2~13
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4754f53979e379370a2d452b114d49a879edca21;p=thirdparty%2Fbind9.git

qmin: fix 'query for .ugly fails when qname-minimization is in strict mode'; remove debugging echos
---

diff --git a/bin/tests/system/qmin/tests.sh b/bin/tests/system/qmin/tests.sh
index 9c669d4358e..00383f51e42 100755
--- a/bin/tests/system/qmin/tests.sh
+++ b/bin/tests/system/qmin/tests.sh
@@ -192,7 +192,6 @@ cat << __EOF | diff ans2/query.log - > /dev/null || ret=1
 NS ugly.
 NS boing.ugly.
 NS boing.ugly.
-NS boing.ugly.
 __EOF
 for ans in ans2 ans3 ans4; do mv -f $ans/query.log query-$ans-$n.log 2>/dev/null || true; done
 if [ $ret != 0 ]; then echo_i "failed"; fi
@@ -205,10 +204,10 @@ ret=0
 $CLEANQL
 $RNDCCMD 10.53.0.7 flush
 $DIG $DIGOPTS icky.icky.icky.ptang.zoop.boing.ugly. @10.53.0.7 > dig.out.test$n
-grep "status: NOERROR" dig.out.test$n > /dev/null || (ret=1; echo "A")
-grep "icky.icky.icky.ptang.zoop.boing.ugly. 1	IN A	192.0.2.1" dig.out.test$n > /dev/null || (ret=1; echo "X")
+grep "status: NOERROR" dig.out.test$n > /dev/null || ret=1
+grep "icky.icky.icky.ptang.zoop.boing.ugly. 1	IN A	192.0.2.1" dig.out.test$n > /dev/null || ret=1
 sleep 1
-cat << __EOF | diff ans2/query.log - > /dev/null || (ret=1; echo "Y")
+cat << __EOF | diff ans2/query.log - > /dev/null || ret=1
 NS ugly.
 NS boing.ugly.
 NS boing.ugly.