echo debug output (D:text) the same as informational (I:text)

(cherry picked from commit dfa1589975cffc1a420e3f133ff2fcd621dd8c15)

diff --git a/bin/tests/system/autosign/ns3/keygen.sh b/bin/tests/system/autosign/ns3/keygen.sh
index 34c98ac172152b2317c58202c72ad85c2b70f52d..8aeb113255761d2d1ba28da9e1057d47db678116 100644 (file)
--- a/bin/tests/system/autosign/ns3/keygen.sh
+++ b/bin/tests/system/autosign/ns3/keygen.sh
@@ -15,8 +15,8 @@ SYSTEMTESTTOP=../..
 SYSTESTDIR=autosign
 
 dumpit () {
-       echo "D:${debug}: dumping ${1}"
-       cat "${1}" | sed 's/^/D:/'
+       echo_d "${debug}: dumping ${1}"
+       cat "${1}" | cat_d
 }
 
 setup () {

diff --git a/bin/tests/system/conf.sh.in b/bin/tests/system/conf.sh.in
index 700eaa0fc97b2eb978c5c797b50663ab5066a803..08f1ac3648b29be1aeb92ec22866ae9679d8d875 100644 (file)
--- a/bin/tests/system/conf.sh.in
+++ b/bin/tests/system/conf.sh.in
@@ -245,6 +245,19 @@ cat_i() {
     done
 }
 
+echo_d() {
+    echo "$@" | while read __LINE ; do
+       echoinfo "D:$SYSTESTDIR:$__LINE"
+    done
+}
+
+cat_d() {
+    while read __LINE ; do
+       echoinfo "D:$SYSTESTDIR:$__LINE"
+    done
+}
+
+
 digcomp() {
     output=`$PERL $SYSTEMTESTTOP/digcomp.pl "$@"`
     result=$?

diff --git a/bin/tests/system/verify/zones/genzones.sh b/bin/tests/system/verify/zones/genzones.sh
index 8d8906663019746307396e94bb5cf616f36ce614..9cdc0a0cdecb6ca50bcd7230b25ba88e91257021 100644 (file)
--- a/bin/tests/system/verify/zones/genzones.sh
+++ b/bin/tests/system/verify/zones/genzones.sh
@@ -13,8 +13,8 @@ SYSTEMTESTTOP=../..
 SYSTESTDIR=verify
 
 dumpit () {
-       echo "D:${debug}: dumping ${1}"
-       cat "${1}" | sed 's/^/D:/'
+       echo_d "${debug}: dumping ${1}"
+       cat "${1}" | cat_d
 }
 setup () {
        echo_i "setting up $2 zone: $1"