Commit dfa15899 authored by Evan Hunt's avatar Evan Hunt
Browse files

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

parent 827d7f0e
Pipeline #6839 canceled with stages
in 8 minutes and 43 seconds
......@@ -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 () {
......
......@@ -33,7 +33,7 @@ testcase() {
check_stdout
check_stderr
if [ "$expect" -ne "$result" ]; then
echo "D:exit status does not match $expect"
echo_d "exit status does not match $expect"
fail
fi
unset name err out
......@@ -45,19 +45,19 @@ check_stderr() {
else
[ -s err.$n ] || return 0
fi
echo "D:stderr did not match '$err'"
sed 's/^/D:/' err.$n
echo_d "stderr did not match '$err'"
cat err.$n | cat_d
fail
}
check_stdout() {
cmp out.$n "${out:-empty}" >/dev/null && return
echo "D:stdout did not match '$out'"
echo_d "stdout did not match '$out'"
( echo "wanted"
cat "$out"
echo "got"
cat out.$n
) | sed 's/^/D:/'
) | cat_d
fail
}
......
......@@ -240,6 +240,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=$?
......
......@@ -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"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment