| Message ID | 20231109162304.119506-5-pablo@netfilter.org |
|---|---|
| State | Changes Requested |
| Headers | show |
| Series | update tests/shell for 5.4 kernels | expand |
Pablo Neira Ayuso <pablo@netfilter.org> wrote: > Skip tests that require stateful expressions in sets. > > Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> > --- > tests/shell/features/set_expr.sh | 19 +++++++++++++++++++ > tests/shell/testcases/json/0002table_map_0 | 1 + > tests/shell/testcases/maps/0009vmap_0 | 2 ++ > .../testcases/optimizations/merge_stmts_vmap | 2 ++ > tests/shell/testcases/sets/0048set_counters_0 | 2 ++ > .../testcases/sets/0051set_interval_counter_0 | 2 ++ > tests/shell/testcases/sets/elem_opts_compat_0 | 2 ++ > 7 files changed, 30 insertions(+) > create mode 100755 tests/shell/features/set_expr.sh > > diff --git a/tests/shell/features/set_expr.sh b/tests/shell/features/set_expr.sh > new file mode 100755 > index 000000000000..c323d59e8920 > --- /dev/null > +++ b/tests/shell/features/set_expr.sh > @@ -0,0 +1,19 @@ > +#!/bin/bash > + > +# 65038428b2c6 ("netfilter: nf_tables: allow to specify stateful expression in set definition") > +# v5.6-rc5-1736-g65038428b2c6 v5.7-rc1~146^2~12^2~25 (git-describe --contains).
diff --git a/tests/shell/features/set_expr.sh b/tests/shell/features/set_expr.sh new file mode 100755 index 000000000000..c323d59e8920 --- /dev/null +++ b/tests/shell/features/set_expr.sh @@ -0,0 +1,19 @@ +#!/bin/bash + +# 65038428b2c6 ("netfilter: nf_tables: allow to specify stateful expression in set definition") +# v5.6-rc5-1736-g65038428b2c6 + +# NFT_SET_EXPR to detect kernel feature only available since +# b4e70d8dd9ea ("netfilter: nftables: add set expression flags") +# v5.10-11680-gb4e70d8dd9ea + +EXPECTED="table ip x { + set y { + typeof ip saddr + counter + } +}" + +$NFT -f - <<< $EXPECTED + +$DIFF -u <($NFT list ruleset) - <<<"$EXPECTED" diff --git a/tests/shell/testcases/json/0002table_map_0 b/tests/shell/testcases/json/0002table_map_0 index b375e9969608..a1e9f2634978 100755 --- a/tests/shell/testcases/json/0002table_map_0 +++ b/tests/shell/testcases/json/0002table_map_0 @@ -1,6 +1,7 @@ #!/bin/bash # NFT_TEST_REQUIRES(NFT_TEST_HAVE_json) +# NFT_TEST_REQUIRES(NFT_TEST_HAVE_set_expr) set -e diff --git a/tests/shell/testcases/maps/0009vmap_0 b/tests/shell/testcases/maps/0009vmap_0 index d31e1608f792..4e133b72f6ef 100755 --- a/tests/shell/testcases/maps/0009vmap_0 +++ b/tests/shell/testcases/maps/0009vmap_0 @@ -1,5 +1,7 @@ #!/bin/bash +# NFT_TEST_REQUIRES(NFT_TEST_HAVE_set_expr) + set -e EXPECTED="table inet filter { diff --git a/tests/shell/testcases/optimizations/merge_stmts_vmap b/tests/shell/testcases/optimizations/merge_stmts_vmap index 6e0f0762b7bb..e5357c0f66b6 100755 --- a/tests/shell/testcases/optimizations/merge_stmts_vmap +++ b/tests/shell/testcases/optimizations/merge_stmts_vmap @@ -1,5 +1,7 @@ #!/bin/bash +# NFT_TEST_REQUIRES(NFT_TEST_HAVE_set_expr) + set -e RULESET="table ip x { diff --git a/tests/shell/testcases/sets/0048set_counters_0 b/tests/shell/testcases/sets/0048set_counters_0 index e62d25df799c..95babdc9ca5f 100755 --- a/tests/shell/testcases/sets/0048set_counters_0 +++ b/tests/shell/testcases/sets/0048set_counters_0 @@ -1,5 +1,7 @@ #!/bin/bash +# NFT_TEST_REQUIRES(NFT_TEST_HAVE_set_expr) + set -e EXPECTED="table ip x { diff --git a/tests/shell/testcases/sets/0051set_interval_counter_0 b/tests/shell/testcases/sets/0051set_interval_counter_0 index ea90e264bfcc..6e67a43c577a 100755 --- a/tests/shell/testcases/sets/0051set_interval_counter_0 +++ b/tests/shell/testcases/sets/0051set_interval_counter_0 @@ -1,5 +1,7 @@ #!/bin/bash +# NFT_TEST_REQUIRES(NFT_TEST_HAVE_set_expr) + set -e EXPECTED="table ip x { diff --git a/tests/shell/testcases/sets/elem_opts_compat_0 b/tests/shell/testcases/sets/elem_opts_compat_0 index 3467cc07e646..7563773e626f 100755 --- a/tests/shell/testcases/sets/elem_opts_compat_0 +++ b/tests/shell/testcases/sets/elem_opts_compat_0 @@ -1,5 +1,7 @@ #!/bin/bash +# NFT_TEST_REQUIRES(NFT_TEST_HAVE_set_expr) + # ordering of element options and expressions has changed, make sure parser # accepts both ways
Skip tests that require stateful expressions in sets. Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> --- tests/shell/features/set_expr.sh | 19 +++++++++++++++++++ tests/shell/testcases/json/0002table_map_0 | 1 + tests/shell/testcases/maps/0009vmap_0 | 2 ++ .../testcases/optimizations/merge_stmts_vmap | 2 ++ tests/shell/testcases/sets/0048set_counters_0 | 2 ++ .../testcases/sets/0051set_interval_counter_0 | 2 ++ tests/shell/testcases/sets/elem_opts_compat_0 | 2 ++ 7 files changed, 30 insertions(+) create mode 100755 tests/shell/features/set_expr.sh