[rt46602] Correct way allow_query test produces RNDC output

(cherry picked from commit 7f2d41d4c492962a0f30b34b326ed87c3c471186)
(cherry picked from commit 36136dec550cd02fecacd7859d30ec0dbbd76792)
(cherry picked from commit 7125bddda84a77a298e65e1489861c319fe86deb)

diff --git a/bin/tests/system/allow_query/tests.sh b/bin/tests/system/allow_query/tests.sh
index 4d2b4209bef3fa045ee39cfe946de7057d56a971..2c75ca3d5fced065f84df449883c9d59ea5a9eac 100644 (file)
--- a/bin/tests/system/allow_query/tests.sh
+++ b/bin/tests/system/allow_query/tests.sh
@@ -61,8 +61,7 @@ SYSTEMTESTTOP=..
 DIGOPTS="+tcp +nosea +nostat +nocmd +norec +noques +noauth +noadd +nostats +dnssec -p ${PORT}"
 
 rndc_reload() {
-    RNDCOUT=`$RNDC -c ../common/rndc.conf -s 10.53.0.2 -p ${CONTROLPORT} reload 2>&1`
-    echo_i "ns2 $RNDCOUT"
+    echo_i "`$RNDC -c ../common/rndc.conf -s 10.53.0.2 -p ${CONTROLPORT} reload 2>&1 | sed 's/^/ns2 /'`"
 }
 
 status=0