From 3f7d2b0036b6e2821a84a08ce39ef2837ebe31a4 Mon Sep 17 00:00:00 2001
From: Evan Hunt <each@isc.org>
Date: Fri, 16 Nov 2018 10:05:07 -0800
Subject: [PATCH] echo debug output (D:text) the same as informational (I:text)

(cherry picked from commit dfa1589975cffc1a420e3f133ff2fcd621dd8c15)
---
 bin/tests/system/autosign/ns3/keygen.sh   |  4 ++--
 bin/tests/system/conf.sh.in               | 13 +++++++++++++
 bin/tests/system/verify/zones/genzones.sh |  4 ++--
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/bin/tests/system/autosign/ns3/keygen.sh b/bin/tests/system/autosign/ns3/keygen.sh
index 34c98ac172..8aeb113255 100644
--- 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 700eaa0fc9..08f1ac3648 100644
--- 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 8d89066630..9cdc0a0cde 100644
--- 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"