All of lore.kernel.org
 help / color / mirror / Atom feed
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>,
	Davide Caratti <dcaratti@redhat.com>,
	 Shuah Khan <shuah@kernel.org>
Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
	 linux-kselftest@vger.kernel.org,
	 "Matthieu Baerts (NGI0)" <matttbe@kernel.org>,
	stable@vger.kernel.org
Subject: [PATCH net 09/13] selftests: mptcp: diag: fix bash warnings on older kernels
Date: Thu, 15 Feb 2024 19:25:36 +0100	[thread overview]
Message-ID: <20240215-upstream-net-20240215-misc-fixes-v1-9-8c01a55d8f6a@kernel.org> (raw)
In-Reply-To: <20240215-upstream-net-20240215-misc-fixes-v1-0-8c01a55d8f6a@kernel.org>

Since the 'Fixes' commit mentioned below, the command that is executed
in __chk_nr() helper can return nothing if the feature is not supported.
This is the case when the MPTCP CURRESTAB counter is not supported.

To avoid this warning ...

  ./diag.sh: line 65: [: !=: unary operator expected

... we just need to surround '$nr' with double quotes, to support an
empty string when the feature is not supported.

Fixes: 81ab772819da ("selftests: mptcp: diag: check CURRESTAB counters")
Cc: stable@vger.kernel.org
Reviewed-by: Geliang Tang <geliang@kernel.org>
Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
---
 tools/testing/selftests/net/mptcp/diag.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/testing/selftests/net/mptcp/diag.sh b/tools/testing/selftests/net/mptcp/diag.sh
index 04fcb8a077c9..e0615c6ffb8d 100755
--- a/tools/testing/selftests/net/mptcp/diag.sh
+++ b/tools/testing/selftests/net/mptcp/diag.sh
@@ -62,8 +62,8 @@ __chk_nr()
 	nr=$(eval $command)
 
 	printf "%-50s" "$msg"
-	if [ $nr != $expected ]; then
-		if [ $nr = "$skip" ] && ! mptcp_lib_expect_all_features; then
+	if [ "$nr" != "$expected" ]; then
+		if [ "$nr" = "$skip" ] && ! mptcp_lib_expect_all_features; then
 			echo "[ skip ] Feature probably not supported"
 			mptcp_lib_result_skip "${msg}"
 		else

-- 
2.43.0


  parent reply	other threads:[~2024-02-15 18:26 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-02-15 18:25 [PATCH net 00/13] mptcp: misc. fixes for v6.8 Matthieu Baerts (NGI0)
2024-02-15 18:25 ` [PATCH net 01/13] mptcp: add needs_id for userspace appending addr Matthieu Baerts (NGI0)
2024-02-15 18:25 ` [PATCH net 02/13] mptcp: add needs_id for netlink " Matthieu Baerts (NGI0)
2024-02-15 18:25 ` [PATCH net 03/13] mptcp: fix lockless access in subflow ULP diag Matthieu Baerts (NGI0)
2024-02-19 17:21   ` Eric Dumazet
2024-02-19 17:35     ` Eric Dumazet
2024-02-19 18:04       ` Paolo Abeni
2024-02-19 18:33         ` Eric Dumazet
2024-02-20 17:33           ` Paolo Abeni
2024-02-20 18:03             ` Eric Dumazet
2024-02-15 18:25 ` [PATCH net 04/13] mptcp: fix data races on local_id Matthieu Baerts (NGI0)
2024-02-15 18:25 ` [PATCH net 05/13] mptcp: fix data races on remote_id Matthieu Baerts (NGI0)
2024-02-15 18:25 ` [PATCH net 06/13] mptcp: fix duplicate subflow creation Matthieu Baerts (NGI0)
2024-02-15 18:25 ` [PATCH net 07/13] selftests: mptcp: pm nl: also list skipped tests Matthieu Baerts (NGI0)
2024-02-15 18:25 ` [PATCH net 08/13] selftests: mptcp: pm nl: avoid error msg on older kernels Matthieu Baerts (NGI0)
2024-02-15 18:25 ` Matthieu Baerts (NGI0) [this message]
2024-02-15 18:25 ` [PATCH net 10/13] selftests: mptcp: simult flows: fix some subtest names Matthieu Baerts (NGI0)
2024-02-15 18:25 ` [PATCH net 11/13] selftests: mptcp: userspace_pm: unique " Matthieu Baerts (NGI0)
2024-02-15 18:25 ` [PATCH net 12/13] selftests: mptcp: diag: unique 'in use' " Matthieu Baerts (NGI0)
2024-02-15 18:25 ` [PATCH net 13/13] selftests: mptcp: diag: unique 'cestab' " Matthieu Baerts (NGI0)
2024-02-18 10:30 ` [PATCH net 00/13] mptcp: misc. fixes for v6.8 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=20240215-upstream-net-20240215-misc-fixes-v1-9-8c01a55d8f6a@kernel.org \
    --to=matttbe@kernel.org \
    --cc=davem@davemloft.net \
    --cc=dcaratti@redhat.com \
    --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=stable@vger.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.