diff options
| author | Thomas Haller <thaller@redhat.com> | 2023-09-18 12:28:27 +0200 |
|---|---|---|
| committer | Florian Westphal <fw@strlen.de> | 2023-09-18 13:08:59 +0200 |
| commit | f30cb622d27e4b14454bccb4b9c0c990a68888df (patch) | |
| tree | eae00a401566bedfa045487ab2c92cb052c4d982 /tests/shell/run-tests.sh | |
| parent | 5f83041242ca0ff38a74d51b85e00047568c4933 (diff) | |
tests/shell: implement NFT_TEST_HAVE_json feature detection as script
No more need to special case the "run a script" approach for detecting
the json feature. Use the new mechanism instead.
Signed-off-by: Thomas Haller <thaller@redhat.com>
Signed-off-by: Florian Westphal <fw@strlen.de>
Diffstat (limited to 'tests/shell/run-tests.sh')
| -rwxr-xr-x | tests/shell/run-tests.sh | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/tests/shell/run-tests.sh b/tests/shell/run-tests.sh index 9c7e280e..528646f5 100755 --- a/tests/shell/run-tests.sh +++ b/tests/shell/run-tests.sh @@ -221,8 +221,7 @@ NFT_TEST_BASEDIR="$(dirname "$0")" # Export the base directory. It may be used by tests. export NFT_TEST_BASEDIR -_HAVE_OPTS=( json ) -_HAVE_OPTS_NFT=() +_HAVE_OPTS=() shopt -s nullglob F=( "$NFT_TEST_BASEDIR/features/"*.nft "$NFT_TEST_BASEDIR/features/"*.sh ) shopt -u nullglob @@ -230,13 +229,12 @@ for file in "${F[@]}"; do feat="${file##*/}" feat="${feat%.*}" re="^[a-z_0-9]+$" - if [[ "$feat" =~ $re ]] && ! array_contains "$feat" "${_HAVE_OPTS[@]}" "${_HAVE_OPTS_NFT[@]}" && [[ "$file" != *.sh || -x "$file" ]] ; then - _HAVE_OPTS_NFT+=( "$feat" ) + if [[ "$feat" =~ $re ]] && ! array_contains "$feat" "${_HAVE_OPTS[@]}" && [[ "$file" != *.sh || -x "$file" ]] ; then + _HAVE_OPTS+=( "$feat" ) else msg_warn "Ignore feature file \"$file\"" fi done -_HAVE_OPTS+=( "${_HAVE_OPTS_NFT[@]}" ) _HAVE_OPTS=( $(printf '%s\n' "${_HAVE_OPTS[@]}" | LANG=C sort) ) for KEY in $(compgen -v | grep '^NFT_TEST_HAVE_' | sort) ; do @@ -486,14 +484,6 @@ fi NFT_REAL="${NFT_REAL-$NFT}" -if [ -z "${NFT_TEST_HAVE_json+x}" ] ; then - NFT_TEST_HAVE_json=y - $NFT_TEST_UNSHARE_CMD "$NFT_REAL" -j list ruleset &>/dev/null || NFT_TEST_HAVE_json=n -else - NFT_TEST_HAVE_json="$(bool_n "$NFT_TEST_HAVE_json")" -fi -export NFT_TEST_HAVE_json - feature_probe() { local with_path="$NFT_TEST_BASEDIR/features/$1" @@ -511,7 +501,7 @@ feature_probe() return 1 } -for feat in "${_HAVE_OPTS_NFT[@]}" ; do +for feat in "${_HAVE_OPTS[@]}" ; do var="NFT_TEST_HAVE_$feat" if [ -z "${!var+x}" ] ; then val='y' |