diff mbox series

[F/H/I/J/Unstable,OEM-5.10/OEM-5.13/OEM-5.14,SRU,1/1] selftests: icmp_redirect: pass xfail=0 to log_test()

Message ID 20211228094351.28059-2-po-hsu.lin@canonical.com
State Accepted
Headers show
Series selftests: icmp_redirect: pass xfail=0 to log_test() | expand

Commit Message

Po-Hsu Lin Dec. 28, 2021, 9:43 a.m. UTC
BugLink: https://bugs.launchpad.net/bugs/1938964

If any sub-test in this icmp_redirect.sh is failing but not expected
to fail. The script will complain:
    ./icmp_redirect.sh: line 72: [: 1: unary operator expected

This is because when the sub-test is not expected to fail, we won't
pass any value for the xfail local variable in log_test() and thus
it's empty. Fix this by passing 0 as the 4th variable to log_test()
for non-xfail cases.

v2: added fixes tag

Fixes: 0a36a75c6818 ("selftests: icmp_redirect: support expected failures")
Signed-off-by: Po-Hsu Lin <po-hsu.lin@canonical.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
(cherry picked from commit 39d8622c72b2b43869d0f49d9cb2d082d01cb0bf)
Signed-off-by: Po-Hsu Lin <po-hsu.lin@canonical.com>
---
 tools/testing/selftests/net/icmp_redirect.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

AceLan Kao Jan. 13, 2022, 7:31 a.m. UTC | #1
applied to oem-5.10, thanks
Acked-By: AceLan Kao <acelan.kao@canonical.com>
diff mbox series

Patch

diff --git a/tools/testing/selftests/net/icmp_redirect.sh b/tools/testing/selftests/net/icmp_redirect.sh
index ecbf57f..7b9d6e3 100755
--- a/tools/testing/selftests/net/icmp_redirect.sh
+++ b/tools/testing/selftests/net/icmp_redirect.sh
@@ -311,7 +311,7 @@  check_exception()
 		ip -netns h1 ro get ${H1_VRF_ARG} ${H2_N2_IP} | \
 		grep -E -v 'mtu|redirected' | grep -q "cache"
 	fi
-	log_test $? 0 "IPv4: ${desc}"
+	log_test $? 0 "IPv4: ${desc}" 0
 
 	# No PMTU info for test "redirect" and "mtu exception plus redirect"
 	if [ "$with_redirect" = "yes" ] && [ "$desc" != "redirect exception plus mtu" ]; then