From: "Matthieu Baerts (NGI0)" <matttbe@kernel.org>
To: mptcp@lists.linux.dev, Mat Martineau <martineau@kernel.org>,
Geliang Tang <geliang@kernel.org>,
"David S. Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@google.com>,
Jakub Kicinski <kuba@kernel.org>,
Paolo Abeni <pabeni@redhat.com>, Shuah Khan <shuah@kernel.org>
Cc: netdev@vger.kernel.org, linux-kselftest@vger.kernel.org,
linux-kernel@vger.kernel.org,
"Matthieu Baerts (NGI0)" <matttbe@kernel.org>,
Geliang Tang <tanggeliang@kylinos.cn>
Subject: [PATCH net-next 03/13] selftests: mptcp: add mptcp_lib_check_output helper
Date: Tue, 05 Mar 2024 11:42:33 +0100 [thread overview]
Message-ID: <20240305-upstream-net-next-20240304-selftests-mptcp-shared-code-shellcheck-v1-3-66618ea5504e@kernel.org> (raw)
In-Reply-To: <20240305-upstream-net-next-20240304-selftests-mptcp-shared-code-shellcheck-v1-0-66618ea5504e@kernel.org>
From: Geliang Tang <tanggeliang@kylinos.cn>
Extract the main part of check() in pm_netlink.sh into a new helper
named mptcp_lib_check_output in mptcp_lib.sh.
This helper will be used for userspace dump addresses tests.
Co-developed-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn>
Reviewed-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
Reviewed-by: Mat Martineau <martineau@kernel.org>
Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
---
tools/testing/selftests/net/mptcp/mptcp_lib.sh | 23 +++++++++++++++++++++++
1 file changed, 23 insertions(+)
diff --git a/tools/testing/selftests/net/mptcp/mptcp_lib.sh b/tools/testing/selftests/net/mptcp/mptcp_lib.sh
index b1fe354cfe96..ed86bb0bab49 100644
--- a/tools/testing/selftests/net/mptcp/mptcp_lib.sh
+++ b/tools/testing/selftests/net/mptcp/mptcp_lib.sh
@@ -373,3 +373,26 @@ mptcp_lib_check_tools() {
esac
done
}
+
+mptcp_lib_check_output() {
+ local err="${1}"
+ local cmd="${2}"
+ local expected="${3}"
+ local cmd_ret=0
+ local out
+
+ if ! out=$(${cmd} 2>"${err}"); then
+ cmd_ret=${?}
+ fi
+
+ if [ ${cmd_ret} -ne 0 ]; then
+ mptcp_lib_print_err "[FAIL] command execution '${cmd}' stderr"
+ cat "${err}"
+ return 2
+ elif [ "${out}" = "${expected}" ]; then
+ return 0
+ else
+ mptcp_lib_print_err "[FAIL] expected '${expected}' got '${out}'"
+ return 1
+ fi
+}
--
2.43.0
next prev parent reply other threads:[~2024-03-05 10:42 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-05 10:42 [PATCH net-next 00/13] selftests: mptcp: share code and fix shellcheck warnings Matthieu Baerts (NGI0)
2024-03-05 10:42 ` [PATCH net-next 01/13] selftests: mptcp: stop forcing iptables-legacy Matthieu Baerts (NGI0)
2024-03-05 10:42 ` [PATCH net-next 02/13] selftests: mptcp: add mptcp_lib_check_tools helper Matthieu Baerts (NGI0)
2024-03-05 10:42 ` Matthieu Baerts (NGI0) [this message]
2024-03-05 11:19 ` [PATCH net-next 03/13] selftests: mptcp: add mptcp_lib_check_output helper Matthieu Baerts
2024-03-05 10:42 ` [PATCH net-next 04/13] selftests: mptcp: add local variables rndh Matthieu Baerts (NGI0)
2024-03-05 10:42 ` [PATCH net-next 05/13] selftests: mptcp: add mptcp_lib_ns_init/exit helpers Matthieu Baerts (NGI0)
2024-03-05 10:42 ` [PATCH net-next 06/13] selftests: mptcp: more operations in ns_init/exit Matthieu Baerts (NGI0)
2024-03-05 10:42 ` [PATCH net-next 07/13] selftests: mptcp: add mptcp_lib_events helper Matthieu Baerts (NGI0)
2024-03-05 10:42 ` [PATCH net-next 08/13] selftests: mptcp: diag: fix shellcheck warnings Matthieu Baerts (NGI0)
2024-03-05 10:42 ` [PATCH net-next 09/13] selftests: mptcp: connect: " Matthieu Baerts (NGI0)
2024-03-05 10:42 ` [PATCH net-next 10/13] selftests: mptcp: sockopt: " Matthieu Baerts (NGI0)
2024-03-05 10:42 ` [PATCH net-next 11/13] selftests: mptcp: pm netlink: " Matthieu Baerts (NGI0)
2024-03-05 10:42 ` [PATCH net-next 12/13] selftests: mptcp: simult flows: " Matthieu Baerts (NGI0)
2024-03-05 10:42 ` [PATCH net-next 13/13] selftests: userspace pm: avoid relaunching pm events Matthieu Baerts (NGI0)
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240305-upstream-net-next-20240304-selftests-mptcp-shared-code-shellcheck-v1-3-66618ea5504e@kernel.org \
--to=matttbe@kernel.org \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=geliang@kernel.org \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=martineau@kernel.org \
--cc=mptcp@lists.linux.dev \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=shuah@kernel.org \
--cc=tanggeliang@kylinos.cn \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®