[v1] selftests: net: fix IOAM test skip return code

[PATCH] selftests: net: fix IOAM test skip return code

Posted by Kleber Sacilotto de Souza 3 years, 8 months ago

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.

Signed-off-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>
---
 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
-- 
2.34.1

Re: [PATCH] selftests: net: fix IOAM test skip return code

Posted by Jakub Kicinski 3 years, 8 months ago

On Wed, 27 Jul 2022 11:37:42 +0200 Kleber Sacilotto de Souza 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.
> 
> Signed-off-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>

Please repost CCing netdev@ (keep Justin's Review tag)

Re: [PATCH] selftests: net: fix IOAM test skip return code

Posted by Justin Iurman 3 years, 8 months ago

On 7/27/22 11:37, Kleber Sacilotto de Souza 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.
> 
> Signed-off-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>
> ---
>   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

LGTM, thanks.

Reviewed-by: Justin Iurman <justin.iurman@uliege.be>