tests: convert `echo -n` to `printf`

The -n option is not standard in POSIX, so convert to printf which should
work the same in every shell.

Signed-off-by: Mike Frysinger <vapier@chromium.org>
main
Mike Frysinger 2015-05-24 21:57:32 -04:00 committed by David Gibson
parent 64c46b098b
commit 8b927bf3b8
1 changed files with 10 additions and 10 deletions

View File

@ -42,20 +42,20 @@ base_run_test() {


shorten_echo () { shorten_echo () {
limit=32 limit=32
echo -n "$1" printf "$1"
shift shift
for x; do for x; do
if [ ${#x} -le $limit ]; then if [ ${#x} -le $limit ]; then
echo -n " $x" printf " $x"
else else
short=$(echo "$x" | head -c$limit) short=$(echo "$x" | head -c$limit)
echo -n " \"$short\"...<${#x} bytes>" printf " \"$short\"...<${#x} bytes>"
fi fi
done done
} }


run_test () { run_test () {
echo -n "$@: " printf "$*: "
if [ -n "$VALGRIND" -a -f $1.supp ]; then if [ -n "$VALGRIND" -a -f $1.supp ]; then
VGSUPP="--suppressions=$1.supp" VGSUPP="--suppressions=$1.supp"
fi fi
@ -63,7 +63,7 @@ run_test () {
} }


run_sh_test () { run_sh_test () {
echo -n "$@: " printf "$*: "
base_run_test sh "$@" base_run_test sh "$@"
} }


@ -106,12 +106,12 @@ wrap_error () {


run_wrap_error_test () { run_wrap_error_test () {
shorten_echo "$@" shorten_echo "$@"
echo -n " {!= 0}: " printf " {!= 0}: "
base_run_test wrap_error "$@" base_run_test wrap_error "$@"
} }


run_dtc_test () { run_dtc_test () {
echo -n "dtc $@: " printf "dtc $*: "
base_run_test wrap_test $VALGRIND $DTC "$@" base_run_test wrap_test $VALGRIND $DTC "$@"
} }


@ -126,7 +126,7 @@ asm_to_so_test () {
run_fdtget_test () { run_fdtget_test () {
expect="$1" expect="$1"
shift shift
echo -n "fdtget-runtest.sh "$expect" $@: " printf "fdtget-runtest.sh %s $*: " "$(echo $expect)"
base_run_test sh fdtget-runtest.sh "$expect" "$@" base_run_test sh fdtget-runtest.sh "$expect" "$@"
} }


@ -134,14 +134,14 @@ run_fdtput_test () {
expect="$1" expect="$1"
shift shift
shorten_echo fdtput-runtest.sh "$expect" "$@" shorten_echo fdtput-runtest.sh "$expect" "$@"
echo -n ": " printf ": "
base_run_test sh fdtput-runtest.sh "$expect" "$@" base_run_test sh fdtput-runtest.sh "$expect" "$@"
} }


run_fdtdump_test() { run_fdtdump_test() {
file="$1" file="$1"
shorten_echo fdtdump-runtest.sh "$file" shorten_echo fdtdump-runtest.sh "$file"
echo -n ": " printf ": "
base_run_test sh fdtdump-runtest.sh "$file" base_run_test sh fdtdump-runtest.sh "$file"
} }