From 7f8d9892fb4ce29821fc824defaa6e0d32740feb Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Tue, 14 Jun 2011 15:37:48 +0200 Subject: tests: use printf, not echo in init.sh's warn_ function * tests/init.sh (warn_): Use printf, not echo. The latter would misbehave when given strings containing a backslash or starting with e.g., -n. James Youngman suggested setting IFS. --- tests/init.sh | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/tests/init.sh b/tests/init.sh index 4a5262630..5f06b5e0a 100644 --- a/tests/init.sh +++ b/tests/init.sh @@ -74,7 +74,17 @@ Exit () { set +e; (exit $1); exit $1; } # the reason for skip/failure to console, rather than to the .log files. : ${stderr_fileno_=2} -warn_ () { echo "$@" 1>&$stderr_fileno_; } +# Call w2_ only via warn_, since correct expansion of "$*" depends on +# IFS starting with ' '. +w2_ () { printf '%s\n' "$*" 1>&$stderr_fileno_ ; } +warn_ () +{ + # If IFS does not start with ' ', set it and emit the warning in a subshell. + case $IFS in + ' '*) w2_ "$@";; + *) (IFS=' '; w2_ "$@");; + esac +} fail_ () { warn_ "$ME_: failed test: $@"; Exit 1; } skip_ () { warn_ "$ME_: skipped test: $@"; Exit 77; } fatal_ () { warn_ "$ME_: hard error: $@"; Exit 99; } -- cgit v1.2.3-70-g09d2