From: Matthieu Baerts <matthieu.baerts@tessares.net>
To: mptcp@lists.linux.dev, Mat Martineau <martineau@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 <matthieu.baerts@tessares.net>
Subject: [PATCH net-next 05/13] selftests: mptcp: userspace_pm: reduce dup code around printf
Date: Mon, 17 Jul 2023 15:21:25 +0200 [thread overview]
Message-ID: <20230717-upstream-net-next-20230712-selftests-mptcp-subtests-v1-5-695127e0ad83@tessares.net> (raw)
In-Reply-To: <20230717-upstream-net-next-20230712-selftests-mptcp-subtests-v1-0-695127e0ad83@tessares.net>
In this selftest, "printf" is always used with "stdbuf".
With a new helper, it is possible to call "stdbuf" only from one place.
This makes the code a bit clearer to read.
Acked-by: Paolo Abeni <pabeni@redhat.com>
Signed-off-by: Matthieu Baerts <matthieu.baerts@tessares.net>
---
tools/testing/selftests/net/mptcp/userspace_pm.sh | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/tools/testing/selftests/net/mptcp/userspace_pm.sh b/tools/testing/selftests/net/mptcp/userspace_pm.sh
index 6b733b97d358..568ddee1d102 100755
--- a/tools/testing/selftests/net/mptcp/userspace_pm.sh
+++ b/tools/testing/selftests/net/mptcp/userspace_pm.sh
@@ -59,21 +59,24 @@ rndh=$(printf %x "$sec")-$(mktemp -u XXXXXX)
ns1="ns1-$rndh"
ns2="ns2-$rndh"
ret=0
+_printf() {
+ stdbuf -o0 -e0 printf "${@}"
+}
print_title()
{
- stdbuf -o0 -e0 printf "INFO: %s\n" "${1}"
+ _printf "INFO: %s\n" "${1}"
}
# $1: test name
print_test()
{
- stdbuf -o0 -e0 printf "%-63s" "${1}"
+ _printf "%-63s" "${1}"
}
print_results()
{
- stdbuf -o0 -e0 printf "[%s]\n" "${1}"
+ _printf "[%s]\n" "${1}"
}
test_pass()
@@ -93,7 +96,7 @@ test_fail()
ret=1
if [ -n "${1}" ]; then
- stdbuf -o0 -e0 printf "\t%s\n" "${1}"
+ _printf "\t%s\n" "${1}"
fi
}
@@ -127,7 +130,7 @@ cleanup()
rm -rf $file $client_evts $server_evts
- stdbuf -o0 -e0 printf "Done\n"
+ _printf "Done\n"
}
trap cleanup EXIT
@@ -288,7 +291,7 @@ check_expected_one()
test_fail
fi
- stdbuf -o0 -e0 printf "\tExpected value for '%s': '%s', got '%s'.\n" \
+ _printf "\tExpected value for '%s': '%s', got '%s'.\n" \
"${var}" "${!exp}" "${!var}"
return 1
}
--
2.40.1
next prev parent reply other threads:[~2023-07-17 13:21 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-17 13:21 [PATCH net-next 00/13] selftests: mptcp: format subtests results in TAP Matthieu Baerts
2023-07-17 13:21 ` [PATCH net-next 01/13] selftests: mptcp: connect: don't stop if error Matthieu Baerts
2023-07-17 13:21 ` [PATCH net-next 02/13] selftests: mptcp: userspace pm: " Matthieu Baerts
2023-07-17 13:21 ` [PATCH net-next 03/13] selftests: mptcp: userspace_pm: fix shellcheck warnings Matthieu Baerts
2023-07-17 13:21 ` [PATCH net-next 04/13] selftests: mptcp: userspace_pm: uniform results printing Matthieu Baerts
2023-07-17 13:21 ` Matthieu Baerts [this message]
2023-07-17 13:21 ` [PATCH net-next 06/13] selftests: mptcp: lib: format subtests results in TAP Matthieu Baerts
2023-07-17 13:21 ` [PATCH net-next 07/13] selftests: mptcp: connect: " Matthieu Baerts
2023-07-17 13:21 ` [PATCH net-next 08/13] selftests: mptcp: pm_netlink: " Matthieu Baerts
2023-07-17 13:21 ` [PATCH net-next 09/13] selftests: mptcp: join: " Matthieu Baerts
2023-07-17 13:21 ` [PATCH net-next 10/13] selftests: mptcp: diag: " Matthieu Baerts
2023-07-17 13:21 ` [PATCH net-next 11/13] selftests: mptcp: simult flows: " Matthieu Baerts
2023-07-17 13:21 ` [PATCH net-next 12/13] selftests: mptcp: sockopt: " Matthieu Baerts
2023-07-17 13:21 ` [PATCH net-next 13/13] selftests: mptcp: userspace_pm: " Matthieu Baerts
2023-07-19 10:20 ` [PATCH net-next 00/13] selftests: mptcp: " patchwork-bot+netdevbpf
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=20230717-upstream-net-next-20230712-selftests-mptcp-subtests-v1-5-695127e0ad83@tessares.net \
--to=matthieu.baerts@tessares.net \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--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 \
/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;
as well as URLs for NNTP newsgroup(s).