UBUNTU: SAUCE: selftests: icmp_redirect: support expected failures

According to a comment in commit 99513cfa16c6 ("selftest: Fixes for
icmp_redirect test") the test "IPv6: mtu exception plus redirect" is
expected to fail, because of a bug in the IPv6 logic that hasn't been
fixed yet apparently.

We should probably consider this failure as an "expected failure",
therefore change the script to return XFAIL for that particular test and
also report the total amount of expected failures at the end of the run.

Link: https://lore.kernel.org/lkml/YNGVaO0pN9VqR8tJ@xps-13-7390/T/#u
Signed-off-by: Andrea Righi <andrea.righi@canonical.com>

diff --git a/tools/testing/selftests/net/icmp_redirect.sh b/tools/testing/selftests/net/icmp_redirect.sh
index bf361f30d6ef912e0b857914c31a419a960fa9c2..c19ecc6a86141310c220fd5380c2397f4c2e7007 100755 (executable)
--- a/tools/testing/selftests/net/icmp_redirect.sh
+++ b/tools/testing/selftests/net/icmp_redirect.sh
@@ -63,10 +63,14 @@ log_test()
        local rc=$1
        local expected=$2
        local msg="$3"
+       local xfail=$4
 
        if [ ${rc} -eq ${expected} ]; then
                printf "TEST: %-60s  [ OK ]\n" "${msg}"
                nsuccess=$((nsuccess+1))
+       elif [ ${rc} -eq ${xfail} ]; then
+               printf "TEST: %-60s  [XFAIL]\n" "${msg}"
+               nxfail=$((nxfail+1))
        else
                ret=1
                nfail=$((nfail+1))
@@ -322,7 +326,7 @@ check_exception()
                ip -netns h1 -6 ro get ${H1_VRF_ARG} ${H2_N2_IP6} | \
                grep -v "mtu" | grep -q "${R1_LLADDR}"
        fi
-       log_test $? 0 "IPv6: ${desc}"
+       log_test $? 0 "IPv6: ${desc}" 1
 }
 
 run_ping()
@@ -488,6 +492,7 @@ which ping6 > /dev/null 2>&1 && ping6=$(which ping6) || ping6=$(which ping)
 ret=0
 nsuccess=0
 nfail=0
+nxfail=0
 
 while getopts :pv o
 do
@@ -532,5 +537,6 @@ fi
 
 printf "\nTests passed: %3d\n" ${nsuccess}
 printf "Tests failed: %3d\n"   ${nfail}
+printf "Tests xfailed: %3d\n"  ${nxfail}
 
 exit $ret