[PATCH nft] check-tree.sh: check and flag /bin/sh usage

[PATCH nft] check-tree.sh: check and flag /bin/sh usage

[Florian Westphal]

Almost all shell tests use /bin/bash already.

In some cases we've had shell tests use /bin/sh, but still having
a bashism.  This causes failures on systems where sh is dash or another,
strict bourne shell.

Flag those via check-tree.sh.

Signed-off-by: Florian Westphal <fw@strlen.de>
---
 tests/shell/testcases/sets/elem_opts_compat_0 | 2 +-
 tools/check-tree.sh                           | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/shell/testcases/sets/elem_opts_compat_0 b/tests/shell/testcases/sets/elem_opts_compat_0
index e0129536fcb7..3467cc07e646 100755
--- a/tests/shell/testcases/sets/elem_opts_compat_0
+++ b/tests/shell/testcases/sets/elem_opts_compat_0
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # ordering of element options and expressions has changed, make sure parser
 # accepts both ways
diff --git a/tools/check-tree.sh b/tools/check-tree.sh
index c3aaa08d05ce..e3ddf8bdea58 100755
--- a/tools/check-tree.sh
+++ b/tools/check-tree.sh
@@ -68,6 +68,7 @@ if [ "${#SHELL_TESTS[@]}" -eq 0 ] ; then
 fi
 for t in "${SHELL_TESTS[@]}" ; do
 	check_shell_dumps "$t"
+	head -n 1 "$t" |grep -q  '^#!/bin/sh' && echo "$t uses sh instead of bash" && EXIT_CODE=1
 done
 
 ##############################################################################
-- 
2.41.0

Re: [PATCH nft] check-tree.sh: check and flag /bin/sh usage

[Pablo Neira Ayuso]

On Tue, Oct 24, 2023 at 12:40:40PM +0200, Florian Westphal wrote:
> Almost all shell tests use /bin/bash already.
> 
> In some cases we've had shell tests use /bin/sh, but still having
> a bashism.  This causes failures on systems where sh is dash or another,
> strict bourne shell.
> 
> Flag those via check-tree.sh.
> 
> Signed-off-by: Florian Westphal <fw@strlen.de>
> ---
>  tests/shell/testcases/sets/elem_opts_compat_0 | 2 +-
>  tools/check-tree.sh                           | 1 +
>  2 files changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/tests/shell/testcases/sets/elem_opts_compat_0 b/tests/shell/testcases/sets/elem_opts_compat_0
> index e0129536fcb7..3467cc07e646 100755
> --- a/tests/shell/testcases/sets/elem_opts_compat_0
> +++ b/tests/shell/testcases/sets/elem_opts_compat_0
> @@ -1,4 +1,4 @@
> -#!/bin/sh
> +#!/bin/bash
>  
>  # ordering of element options and expressions has changed, make sure parser
>  # accepts both ways

Amend before applying, I was too fast to push out the fix for
elem_opts_compat_0.

Thanks.

> diff --git a/tools/check-tree.sh b/tools/check-tree.sh
> index c3aaa08d05ce..e3ddf8bdea58 100755
> --- a/tools/check-tree.sh
> +++ b/tools/check-tree.sh
> @@ -68,6 +68,7 @@ if [ "${#SHELL_TESTS[@]}" -eq 0 ] ; then
>  fi
>  for t in "${SHELL_TESTS[@]}" ; do
>  	check_shell_dumps "$t"
> +	head -n 1 "$t" |grep -q  '^#!/bin/sh' && echo "$t uses sh instead of bash" && EXIT_CODE=1
>  done
>  
>  ##############################################################################
> -- 
> 2.41.0
>