diff options
| author | Florian Westphal <fw@strlen.de> | 2024-04-12 01:36:14 +0200 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2024-04-12 17:51:26 -0700 |
| commit | 10e2ed3fcdf4834ed02beae1860ea2555b484a40 (patch) | |
| tree | 71b0038452c2a2993b92db47bc99968f50153e47 /tools/testing | |
| parent | 0413156eec28e45d12e70d382d1f890b7d2f1a53 (diff) | |
| download | linux-10e2ed3fcdf4834ed02beae1860ea2555b484a40.tar.gz linux-10e2ed3fcdf4834ed02beae1860ea2555b484a40.tar.bz2 linux-10e2ed3fcdf4834ed02beae1860ea2555b484a40.zip | |
selftests: netfilter: place checktool helper in lib.sh
... so it doesn't have to be repeated everywhere.
Signed-off-by: Florian Westphal <fw@strlen.de>
Link: https://lore.kernel.org/r/20240411233624.8129-10-fw@strlen.de
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'tools/testing')
| -rwxr-xr-x | tools/testing/selftests/net/netfilter/br_netfilter.sh | 6 | ||||
| -rwxr-xr-x | tools/testing/selftests/net/netfilter/conntrack_ipip_mtu.sh | 7 | ||||
| -rw-r--r-- | tools/testing/selftests/net/netfilter/lib.sh | 7 |
3 files changed, 8 insertions, 12 deletions
diff --git a/tools/testing/selftests/net/netfilter/br_netfilter.sh b/tools/testing/selftests/net/netfilter/br_netfilter.sh index ea3afd6d401f..1084faf88f0b 100755 --- a/tools/testing/selftests/net/netfilter/br_netfilter.sh +++ b/tools/testing/selftests/net/netfilter/br_netfilter.sh @@ -11,11 +11,7 @@ source lib.sh -nft --version > /dev/null 2>&1 -if [ $? -ne 0 ];then - echo "SKIP: Could not run test without nft tool" - exit $ksft_skip -fi +checktool "nft --version" "run test without nft tool" cleanup() { cleanup_all_ns diff --git a/tools/testing/selftests/net/netfilter/conntrack_ipip_mtu.sh b/tools/testing/selftests/net/netfilter/conntrack_ipip_mtu.sh index f87ca4c59d3b..ac0dff0f80d7 100755 --- a/tools/testing/selftests/net/netfilter/conntrack_ipip_mtu.sh +++ b/tools/testing/selftests/net/netfilter/conntrack_ipip_mtu.sh @@ -24,13 +24,6 @@ source lib.sh rx=$(mktemp) -checktool (){ - if ! $1 > /dev/null 2>&1; then - echo "SKIP: Could not $2" - exit $ksft_skip - fi -} - checktool "iptables --version" "run test without iptables" checktool "socat -h" "run test without socat" diff --git a/tools/testing/selftests/net/netfilter/lib.sh b/tools/testing/selftests/net/netfilter/lib.sh index eb109eb527db..bedd35298e15 100644 --- a/tools/testing/selftests/net/netfilter/lib.sh +++ b/tools/testing/selftests/net/netfilter/lib.sh @@ -1,3 +1,10 @@ net_netfilter_dir=$(dirname "$(readlink -e "${BASH_SOURCE[0]}")") source "$net_netfilter_dir/../lib.sh" + +checktool (){ + if ! $1 > /dev/null 2>&1; then + echo "SKIP: Could not $2" + exit $ksft_skip + fi +} |