selftests: mptcp: join: helpers to skip tests
commitcdb5052534
upstream. Selftests are supposed to run on any kernels, including the old ones not supporting all MPTCP features. Here are some helpers that will be used to mark subtests as skipped if a feature is not supported. Marking as a fix for the commit introducing this selftest to help with the backports. While at it, also check if kallsyms feature is available as it will also be used in the following commits to check if MPTCP features are available before starting a test. Link: https://github.com/multipath-tcp/mptcp_net-next/issues/368 Fixes:b08fbf2410
("selftests: add test-cases for MPTCP MP_JOIN") Cc: stable@vger.kernel.org Signed-off-by: Matthieu Baerts <matthieu.baerts@tessares.net> Signed-off-by: Jakub Kicinski <kuba@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
4d65ec947d
commit
e35edb09e5
|
@ -137,6 +137,7 @@ cleanup_partial()
|
|||
check_tools()
|
||||
{
|
||||
mptcp_lib_check_mptcp
|
||||
mptcp_lib_check_kallsyms
|
||||
|
||||
if ! ip -Version &> /dev/null; then
|
||||
echo "SKIP: Could not run test without ip tool"
|
||||
|
@ -183,6 +184,32 @@ cleanup()
|
|||
cleanup_partial
|
||||
}
|
||||
|
||||
# $1: msg
|
||||
print_title()
|
||||
{
|
||||
printf "%03u %-36s %s" "${TEST_COUNT}" "${TEST_NAME}" "${1}"
|
||||
}
|
||||
|
||||
# [ $1: fail msg ]
|
||||
mark_as_skipped()
|
||||
{
|
||||
local msg="${1:-"Feature not supported"}"
|
||||
|
||||
mptcp_lib_fail_if_expected_feature "${msg}"
|
||||
|
||||
print_title "[ skip ] ${msg}"
|
||||
printf "\n"
|
||||
}
|
||||
|
||||
# $@: condition
|
||||
continue_if()
|
||||
{
|
||||
if ! "${@}"; then
|
||||
mark_as_skipped
|
||||
return 1
|
||||
fi
|
||||
}
|
||||
|
||||
skip_test()
|
||||
{
|
||||
if [ "${#only_tests_ids[@]}" -eq 0 ] && [ "${#only_tests_names[@]}" -eq 0 ]; then
|
||||
|
|
Loading…
Reference in New Issue