From 4754f53979e379370a2d452b114d49a879edca21 Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Wed, 19 Sep 2018 15:25:54 +1000 Subject: [PATCH] qmin: fix 'query for .ugly fails when qname-minimization is in strict mode'; remove debugging echos --- bin/tests/system/qmin/tests.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/bin/tests/system/qmin/tests.sh b/bin/tests/system/qmin/tests.sh index 9c669d4358..00383f51e4 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.