diff options
| author | Florian Westphal <fw@strlen.de> | 2023-09-18 12:28:26 +0200 |
|---|---|---|
| committer | Florian Westphal <fw@strlen.de> | 2023-09-18 13:08:57 +0200 |
| commit | 5f83041242ca0ff38a74d51b85e00047568c4933 (patch) | |
| tree | 15c625ba17b2a5c6281c35c9468ef9f2edf514fa /tests/shell/run-tests.sh | |
| parent | 45060a09bc3ad1c4bcfd4ad91863e00ab58efb5b (diff) | |
tests/shell: skip reset tests if kernel lacks support
reset is implemented via flush + extra attribute, so older kernels
perform a flush. This means .nft doesn't work, we need to check
if the individual set contents/sets are still in place post-reset.
Make this generic and permit use of feat.sh in addition to the simpler
foo.nft feature files.
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Thomas Haller <thaller@redhat.com>
Diffstat (limited to 'tests/shell/run-tests.sh')
| -rwxr-xr-x | tests/shell/run-tests.sh | 25 |
1 files changed, 21 insertions, 4 deletions
diff --git a/tests/shell/run-tests.sh b/tests/shell/run-tests.sh index d11b4a63..9c7e280e 100755 --- a/tests/shell/run-tests.sh +++ b/tests/shell/run-tests.sh @@ -224,13 +224,13 @@ export NFT_TEST_BASEDIR _HAVE_OPTS=( json ) _HAVE_OPTS_NFT=() shopt -s nullglob -F=( "$NFT_TEST_BASEDIR/features/"*.nft ) +F=( "$NFT_TEST_BASEDIR/features/"*.nft "$NFT_TEST_BASEDIR/features/"*.sh ) shopt -u nullglob for file in "${F[@]}"; do feat="${file##*/}" - feat="${feat%.nft}" + feat="${feat%.*}" re="^[a-z_0-9]+$" - if [[ "$feat" =~ $re ]] && ! array_contains "$feat" "${_HAVE_OPTS[@]}" ; then + if [[ "$feat" =~ $re ]] && ! array_contains "$feat" "${_HAVE_OPTS[@]}" "${_HAVE_OPTS_NFT[@]}" && [[ "$file" != *.sh || -x "$file" ]] ; then _HAVE_OPTS_NFT+=( "$feat" ) else msg_warn "Ignore feature file \"$file\"" @@ -494,11 +494,28 @@ else fi export NFT_TEST_HAVE_json +feature_probe() +{ + local with_path="$NFT_TEST_BASEDIR/features/$1" + + if [ -r "$with_path.nft" ] ; then + $NFT_TEST_UNSHARE_CMD "$NFT_REAL" --check -f "$with_path.nft" &>/dev/null + return $? + fi + + if [ -x "$with_path.sh" ] ; then + NFT="$NFT_REAL" $NFT_TEST_UNSHARE_CMD "$with_path.sh" &>/dev/null + return $? + fi + + return 1 +} + for feat in "${_HAVE_OPTS_NFT[@]}" ; do var="NFT_TEST_HAVE_$feat" if [ -z "${!var+x}" ] ; then val='y' - $NFT_TEST_UNSHARE_CMD "$NFT_REAL" --check -f "$NFT_TEST_BASEDIR/features/$feat.nft" &>/dev/null || val='n' + feature_probe "$feat" || val='n' else val="$(bool_n "${!var}")" fi |