Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

selftests: nft_concat_range: Move option for 'list ruleset' before command

Before nftables commit fb9cea50e8b3 ("main: enforce options before
commands"), 'nft list ruleset -a' happened to work, but it's wrong
and won't work anymore. Replace it by 'nft -a list ruleset'.

Reported-by: Chen Yi <yiche@redhat.com>
Fixes: 611973c1e06f ("selftests: netfilter: Introduce tests for sets with range concatenation")
Signed-off-by: Stefano Brivio <sbrivio@redhat.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

authored by

Stefano Brivio and committed by
Pablo Neira Ayuso
d0820556 3614d05b

+6 -6
+6 -6
tools/testing/selftests/netfilter/nft_concat_range.sh
··· 1025 1025 add() { 1026 1026 if ! nft add element inet filter test "${1}"; then 1027 1027 err "Failed to add ${1} given ruleset:" 1028 - err "$(nft list ruleset -a)" 1028 + err "$(nft -a list ruleset)" 1029 1029 return 1 1030 1030 fi 1031 1031 } ··· 1045 1045 add_perf_norange() { 1046 1046 if ! nft add element netdev perf norange "${1}"; then 1047 1047 err "Failed to add ${1} given ruleset:" 1048 - err "$(nft list ruleset -a)" 1048 + err "$(nft -a list ruleset)" 1049 1049 return 1 1050 1050 fi 1051 1051 } ··· 1054 1054 add_perf_noconcat() { 1055 1055 if ! nft add element netdev perf noconcat "${1}"; then 1056 1056 err "Failed to add ${1} given ruleset:" 1057 - err "$(nft list ruleset -a)" 1057 + err "$(nft -a list ruleset)" 1058 1058 return 1 1059 1059 fi 1060 1060 } ··· 1063 1063 del() { 1064 1064 if ! nft delete element inet filter test "${1}"; then 1065 1065 err "Failed to delete ${1} given ruleset:" 1066 - err "$(nft list ruleset -a)" 1066 + err "$(nft -a list ruleset)" 1067 1067 return 1 1068 1068 fi 1069 1069 } ··· 1134 1134 err " $(for f in ${src}; do 1135 1135 eval format_\$f "${2}"; printf ' '; done)" 1136 1136 err "should have matched ruleset:" 1137 - err "$(nft list ruleset -a)" 1137 + err "$(nft -a list ruleset)" 1138 1138 return 1 1139 1139 fi 1140 1140 nft reset counter inet filter test >/dev/null ··· 1160 1160 err " $(for f in ${src}; do 1161 1161 eval format_\$f "${2}"; printf ' '; done)" 1162 1162 err "should not have matched ruleset:" 1163 - err "$(nft list ruleset -a)" 1163 + err "$(nft -a list ruleset)" 1164 1164 return 1 1165 1165 fi 1166 1166 }