]> git.ipfire.org Git - thirdparty/bind9.git/commitdiff
don't swallow backslash characters in test output
authorMark Andrews <marka@isc.org>
Tue, 4 Feb 2020 00:52:06 +0000 (11:52 +1100)
committerEvan Hunt <each@isc.org>
Tue, 4 Feb 2020 02:58:27 +0000 (18:58 -0800)
bin/tests/system/conf.sh.common

index af4fac1e91dee2f3fe2df588331b81778a4df71f..0e559c7f7926de5a2420d9d7ef712fb73e0c9f67 100644 (file)
@@ -95,6 +95,8 @@ else
     COLOR_WARN=''
 fi
 
+SYSTESTDIR="`basename $PWD`"
+
 if type printf > /dev/null 2>&1
 then
        echofail () {
@@ -115,6 +117,23 @@ then
        echoend () {
                printf "${COLOR_END}%s${COLOR_NONE}\n" "$*"
        }
+       echo_i() {
+           printf '%s\n' "$*" | while read -r __LINE ; do
+              echoinfo "I:$SYSTESTDIR:$__LINE"
+           done
+       }
+
+       echo_ic() {
+           printf '%s\n' "$*" | while read -r __LINE ; do
+              echoinfo "I:$SYSTESTDIR:  $__LINE"
+           done
+       }
+
+       echo_d() {
+           printf '%s\n' "$*" | while read -r __LINE ; do
+              echoinfo "D:$SYSTESTDIR:$__LINE"
+           done
+       }
 else
        echofail () {
                echo "$*"
@@ -134,36 +153,34 @@ else
        echoend () {
                echo "$*"
        }
-fi
 
-SYSTESTDIR="`basename $PWD`"
+       echo_i() {
+           echo "$@" | while read -r __LINE ; do
+              echoinfo "I:$SYSTESTDIR:$__LINE"
+           done
+       }
 
-echo_i() {
-    echo "$@" | while read __LINE ; do
-       echoinfo "I:$SYSTESTDIR:$__LINE"
-    done
-}
+       echo_ic() {
+           echo "$@" | while read -r __LINE ; do
+              echoinfo "I:$SYSTESTDIR:  $__LINE"
+           done
+       }
 
-echo_ic() {
-    echo "$@" | while read __LINE ; do
-       echoinfo "I:$SYSTESTDIR:  $__LINE"
-    done
-}
+       echo_d() {
+           echo "$@" | while read -r __LINE ; do
+              echoinfo "D:$SYSTESTDIR:$__LINE"
+           done
+       }
+fi
 
 cat_i() {
-    while read __LINE ; do
+    while read -r __LINE ; do
        echoinfo "I:$SYSTESTDIR:$__LINE"
     done
 }
 
-echo_d() {
-    echo "$@" | while read __LINE ; do
-       echoinfo "D:$SYSTESTDIR:$__LINE"
-    done
-}
-
 cat_d() {
-    while read __LINE ; do
+    while read -r __LINE ; do
        echoinfo "D:$SYSTESTDIR:$__LINE"
     done
 }