[PATCH v2] Fix test script to run also on dash shell

[PATCH v2] Fix test script to run also on dash shell

[Tero Tervala]

/bin/sh points to dash instead of bash in some linux distros.
One test would fail if dash was used, this fix will allow all tests
to run properly on dash too.

dash built-in printf does not support "\xNN" -hex escape format.
"\NNN" -octal escape format is supported by both bash and dash printf.

Replaced "$(echo "$expect")" because this actually runs /bin/echo
instead of shell internal echo and in some cases causes "\NNN" escapes
to be printed as the actual characters they represent instead of the
escape sequence itself.

Cosmetic quotes added to make printout a bit clearer.

Signed-off-by: Tero Tervala <tero.tervala-ddXEi6N5mqbQT0dZR+AlfA@public.gmane.org>
---
 tests/run_tests.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/run_tests.sh b/tests/run_tests.sh
index c78351d..1b16eb8 100755
--- a/tests/run_tests.sh
+++ b/tests/run_tests.sh
@@ -195,7 +195,7 @@ asm_to_so_test () {
 run_fdtget_test () {
     expect="$1"
     shift
-    printf "fdtget-runtest.sh %s $*:	" "$(echo $expect)"
+    printf "fdtget-runtest.sh \"%s\" $*:	" "$expect"
     base_run_test sh "$SRCDIR/fdtget-runtest.sh" "$expect" "$@"
 }
 
@@ -862,7 +862,7 @@ fdtget_tests () {
     run_fdtget_test "61 62 63 0" -tbx $dtb /randomnode tricky1
     run_fdtget_test "a b c d de ea ad be ef" -tbx $dtb /randomnode blob
     run_fdtget_test "MyBoardName\0MyBoardFamilyName\0" -tr $dtb / compatible
-    run_fdtget_test "\x0a\x0b\x0c\x0d\xde\xea\xad\xbe\xef" -tr $dtb /randomnode blob
+    run_fdtget_test "\012\013\014\015\336\352\255\276\357" -tr $dtb /randomnode blob
 
     # Here the property size is not a multiple of 4 bytes, so it should fail
     run_wrap_error_test $DTGET -tlx $dtb /randomnode mixed
-- 
2.33.3

Re: [PATCH v2] Fix test script to run also on dash shell

[David Gibson]

[-- Attachment #1: Type: text/plain, Size: 2149 bytes --]

On Mon, Jul 04, 2022 at 10:37:22AM +0300, Tero Tervala wrote:
> /bin/sh points to dash instead of bash in some linux distros.
> One test would fail if dash was used, this fix will allow all tests
> to run properly on dash too.
> 
> dash built-in printf does not support "\xNN" -hex escape format.
> "\NNN" -octal escape format is supported by both bash and dash printf.
> 
> Replaced "$(echo "$expect")" because this actually runs /bin/echo
> instead of shell internal echo and in some cases causes "\NNN" escapes
> to be printed as the actual characters they represent instead of the
> escape sequence itself.
> 
> Cosmetic quotes added to make printout a bit clearer.
> 
> Signed-off-by: Tero Tervala <tero.tervala-ddXEi6N5mqbQT0dZR+AlfA@public.gmane.org>

Applied, thanks.

Sorry it took so long.

> ---
>  tests/run_tests.sh | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/tests/run_tests.sh b/tests/run_tests.sh
> index c78351d..1b16eb8 100755
> --- a/tests/run_tests.sh
> +++ b/tests/run_tests.sh
> @@ -195,7 +195,7 @@ asm_to_so_test () {
>  run_fdtget_test () {
>      expect="$1"
>      shift
> -    printf "fdtget-runtest.sh %s $*:	" "$(echo $expect)"
> +    printf "fdtget-runtest.sh \"%s\" $*:	" "$expect"
>      base_run_test sh "$SRCDIR/fdtget-runtest.sh" "$expect" "$@"
>  }
>  
> @@ -862,7 +862,7 @@ fdtget_tests () {
>      run_fdtget_test "61 62 63 0" -tbx $dtb /randomnode tricky1
>      run_fdtget_test "a b c d de ea ad be ef" -tbx $dtb /randomnode blob
>      run_fdtget_test "MyBoardName\0MyBoardFamilyName\0" -tr $dtb / compatible
> -    run_fdtget_test "\x0a\x0b\x0c\x0d\xde\xea\xad\xbe\xef" -tr $dtb /randomnode blob
> +    run_fdtget_test "\012\013\014\015\336\352\255\276\357" -tr $dtb /randomnode blob
>  
>      # Here the property size is not a multiple of 4 bytes, so it should fail
>      run_wrap_error_test $DTGET -tlx $dtb /randomnode mixed

-- 
David Gibson			| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au	| minimalist, thank you.  NOT _the_ _other_
				| _way_ _around_!
http://www.ozlabs.org/~dgibson

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]