123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596 |
- From ed3d76cd1c8f91f5e86424e899448d6221b0f76c Mon Sep 17 00:00:00 2001
- From: Mike Frysinger <vapier@chromium.org>
- Date: Wed, 6 May 2015 01:53:39 -0400
- Subject: [PATCH] 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>
- ---
- tests/run_tests.sh | 20 ++++++++++----------
- 1 file changed, 10 insertions(+), 10 deletions(-)
- diff --git a/tests/run_tests.sh b/tests/run_tests.sh
- index c870432..0dda54a 100755
- --- a/tests/run_tests.sh
- +++ b/tests/run_tests.sh
- @@ -42,20 +42,20 @@ base_run_test() {
-
- shorten_echo () {
- limit=32
- - echo -n "$1"
- + printf "$1"
- shift
- for x; do
- if [ ${#x} -le $limit ]; then
- - echo -n " $x"
- + printf " $x"
- else
- short=$(echo "$x" | head -c$limit)
- - echo -n " \"$short\"...<${#x} bytes>"
- + printf " \"$short\"...<${#x} bytes>"
- fi
- done
- }
-
- run_test () {
- - echo -n "$@: "
- + printf "$@: "
- if [ -n "$VALGRIND" -a -f $1.supp ]; then
- VGSUPP="--suppressions=$1.supp"
- fi
- @@ -63,7 +63,7 @@ run_test () {
- }
-
- run_sh_test () {
- - echo -n "$@: "
- + printf "$@: "
- base_run_test sh "$@"
- }
-
- @@ -106,12 +106,12 @@ wrap_error () {
-
- run_wrap_error_test () {
- shorten_echo "$@"
- - echo -n " {!= 0}: "
- + printf " {!= 0}: "
- base_run_test wrap_error "$@"
- }
-
- run_dtc_test () {
- - echo -n "dtc $@: "
- + printf "dtc $@: "
- base_run_test wrap_test $VALGRIND $DTC "$@"
- }
-
- @@ -126,7 +126,7 @@ asm_to_so_test () {
- run_fdtget_test () {
- expect="$1"
- shift
- - echo -n "fdtget-runtest.sh "$expect" $@: "
- + printf "fdtget-runtest.sh "$expect" $@: "
- base_run_test sh fdtget-runtest.sh "$expect" "$@"
- }
-
- @@ -134,14 +134,14 @@ run_fdtput_test () {
- expect="$1"
- shift
- shorten_echo fdtput-runtest.sh "$expect" "$@"
- - echo -n ": "
- + printf ": "
- base_run_test sh fdtput-runtest.sh "$expect" "$@"
- }
-
- run_fdtdump_test() {
- file="$1"
- shorten_echo fdtdump-runtest.sh "$file"
- - echo -n ": "
- + printf ": "
- base_run_test sh fdtdump-runtest.sh "$file"
- }
-
- --
- 2.4.0
|