Merge branch 'fix-debug-output-v9_11' into 'v9_11'

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

See merge request isc-projects/bind9!1084
This commit is contained in:
Evan Hunt 2018-11-16 14:44:21 -05:00
commit 3458eb05a8
3 changed files with 17 additions and 4 deletions

View file

@ -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 () {

View file

@ -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=$?

View file

@ -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"