The ioam6.sh test script exits with an error code (1) when tests are skipped due to lack of support from userspace/kernel or not enough permissions. It should return the kselftests SKIP code instead.
Reviewed-by: Justin Iurman justin.iurman@uliege.be Signed-off-by: Kleber Sacilotto de Souza kleber.souza@canonical.com ---
Notes: - Reposting to CC netdev@ - Keeping Justin's Review tag from the original post
tools/testing/selftests/net/ioam6.sh | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/tools/testing/selftests/net/ioam6.sh b/tools/testing/selftests/net/ioam6.sh index a2b9fad5a9a6..4ceb401da1bf 100755 --- a/tools/testing/selftests/net/ioam6.sh +++ b/tools/testing/selftests/net/ioam6.sh @@ -117,6 +117,8 @@ # | Schema Data | | # +-----------------------------------------------------------+
+# Kselftest framework requirement - SKIP code is 4. +ksft_skip=4
################################################################################ # # @@ -211,7 +213,7 @@ check_kernel_compatibility() echo "SKIP: kernel version probably too old, missing ioam support" ip link del veth0 2>/dev/null || true ip netns del ioam-tmp-node || true - exit 1 + exit $ksft_skip fi
ip -netns ioam-tmp-node route add db02::/64 encap ioam6 mode inline \ @@ -227,7 +229,7 @@ check_kernel_compatibility() "without CONFIG_IPV6_IOAM6_LWTUNNEL?" ip link del veth0 2>/dev/null || true ip netns del ioam-tmp-node || true - exit 1 + exit $ksft_skip fi
ip link del veth0 2>/dev/null || true @@ -752,20 +754,20 @@ nfailed=0 if [ "$(id -u)" -ne 0 ] then echo "SKIP: Need root privileges" - exit 1 + exit $ksft_skip fi
if [ ! -x "$(command -v ip)" ] then echo "SKIP: Could not run test without ip tool" - exit 1 + exit $ksft_skip fi
ip ioam &>/dev/null if [ $? = 1 ] then echo "SKIP: iproute2 too old, missing ioam command" - exit 1 + exit $ksft_skip fi
check_kernel_compatibility
Hello:
This patch was applied to netdev/net-next.git (master) by Paolo Abeni pabeni@redhat.com:
On Mon, 1 Aug 2022 14:46:15 +0200 you wrote:
The ioam6.sh test script exits with an error code (1) when tests are skipped due to lack of support from userspace/kernel or not enough permissions. It should return the kselftests SKIP code instead.
Reviewed-by: Justin Iurman justin.iurman@uliege.be Signed-off-by: Kleber Sacilotto de Souza kleber.souza@canonical.com
[...]
Here is the summary with links: - [RESEND] selftests: net: fix IOAM test skip return code https://git.kernel.org/netdev/net-next/c/1995943c3f2a
You are awesome, thank you!
linux-kselftest-mirror@lists.linaro.org