selftests: mptcp: extract mptcp_lib_check_expected

Extract the main part of check_expected() in userspace_pm.sh to a new
function mptcp_lib_check_expected() in mptcp_lib.sh. It will be used
in both mptcp_john.sh and userspace_pm.sh. check_expected_one() is
moved into mptcp_lib.sh too as mptcp_lib_check_expected_one().

Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn>
Reviewed-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
Link: https://lore.kernel.org/r/20240308-upstream-net-next-20240308-selftests-mptcp-unification-v1-11-4f42c347b653@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/tools/testing/selftests/net/mptcp/mptcp_lib.sh b/tools/testing/selftests/net/mptcp/mptcp_lib.sh
index ea39392c68e73cdd2fcc7df719f02aa0e5fbaa08..44491f18ed177041a99b56c29e75629474197671 100644 (file)
--- a/tools/testing/selftests/net/mptcp/mptcp_lib.sh
+++ b/tools/testing/selftests/net/mptcp/mptcp_lib.sh
@@ -438,3 +438,33 @@ mptcp_lib_print_title() {
        # shellcheck disable=SC2059 # the format is in a variable
        printf "${MPTCP_LIB_TEST_FORMAT}" "$((++MPTCP_LIB_TEST_COUNTER))" "${*}"
 }
+
+# $1: var name ; $2: prev ret
+mptcp_lib_check_expected_one() {
+       local var="${1}"
+       local exp="e_${var}"
+       local prev_ret="${2}"
+
+       if [ "${!var}" = "${!exp}" ]; then
+               return 0
+       fi
+
+       if [ "${prev_ret}" = "0" ]; then
+               mptcp_lib_pr_fail
+       fi
+
+       mptcp_lib_print_err "Expected value for '${var}': '${!exp}', got '${!var}'."
+       return 1
+}
+
+# $@: all var names to check
+mptcp_lib_check_expected() {
+       local rc=0
+       local var
+
+       for var in "${@}"; do
+               mptcp_lib_check_expected_one "${var}" "${rc}" || rc=1
+       done
+
+       return "${rc}"
+}

diff --git a/tools/testing/selftests/net/mptcp/userspace_pm.sh b/tools/testing/selftests/net/mptcp/userspace_pm.sh
index bc2f0184b1eb9c69dff59e56fc9e569ed210c92d..6d0862a1b68da55eb919f0d44890ba915f9ceb1c 100755 (executable)
--- a/tools/testing/selftests/net/mptcp/userspace_pm.sh
+++ b/tools/testing/selftests/net/mptcp/userspace_pm.sh
@@ -5,7 +5,7 @@
 # code but we accept it.
 #shellcheck disable=SC2086
 
-# Some variables are used below but indirectly, see check_expected_one()
+# Some variables are used below but indirectly, see verify_*_event()
 #shellcheck disable=SC2034
 
 . "$(dirname "${0}")/mptcp_lib.sh"
@@ -228,39 +228,10 @@ make_connection()
        fi
 }
 
-# $1: var name ; $2: prev ret
-check_expected_one()
-{
-       local var="${1}"
-       local exp="e_${var}"
-       local prev_ret="${2}"
-
-       if [ "${!var}" = "${!exp}" ]
-       then
-               return 0
-       fi
-
-       if [ "${prev_ret}" = "0" ]
-       then
-               mptcp_lib_pr_fail
-       fi
-
-       mptcp_lib_print_err "\tExpected value for '${var}': '${!exp}', got '${!var}'."
-       return 1
-}
-
 # $@: all var names to check
 check_expected()
 {
-       local rc=0
-       local var
-
-       for var in "${@}"
-       do
-               check_expected_one "${var}" "${rc}" || rc=1
-       done
-
-       if [ ${rc} -eq 0 ]
+       if mptcp_lib_check_expected "${@}"
        then
                test_pass
                return 0