Commit 633f5c7f authored by Matthieu Baerts (NGI0)'s avatar Matthieu Baerts (NGI0) Committed by Geliang Tang
Browse files

selftests: mptcp: sockopt: fix shellcheck warnings 

mainline inclusion
from mainline-v6.9-rc1
commit 5751c291349deb9c1fa59455df3c9e1be30137a5
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I9VYQ9
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/commit/?id=5751c291349deb9c1fa59455df3c9e1be30137a5



--------------------------------

shellcheck recently helped to prevent issues. It is then good to fix the
other harmless issues in order to spot "real" ones later.

Here, two categories of warnings are now ignored:

- SC2317: Command appears to be unreachable. The cleanup() function is
  invoked indirectly via the EXIT trap.

- SC2086: Double quote to prevent globbing and word splitting. This is
  recommended, but the current usage is correct and there is no need to
  do all these modifications to be compliant with this rule.

For the modifications:

  - SC2034: ksft_skip appears unused.
  - SC2006: Use $(...) notation instead of legacy backticks `...`.
  - SC2145: Argument mixes string and array. Use * or separate argument.

Now this script is shellcheck (0.9.0) compliant. We can easily spot new
issues.

Reviewed-by: default avatarMat Martineau <martineau@kernel.org>
Signed-off-by: default avatarMatthieu Baerts (NGI0) <matttbe@kernel.org>
Link: https://lore.kernel.org/r/20240306-upstream-net-next-20240304-selftests-mptcp-shared-code-shellcheck-v2-9-bc79e6e5e6a0@kernel.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
Reviewed-by: default avatarJackie Liu <liuyun01@kylinos.cn>
Signed-off-by: default avatarGeliang Tang <tanggeliang@kylinos.cn>
parent 6f3ed95b

tools/testing/selftests/net/mptcp/mptcp_sockopt.sh

+10 −4
Original line number Diff line number Diff line 
#!/bin/bash

# SPDX-License-Identifier: GPL-2.0



# Double quotes to prevent globbing and word splitting is recommended in new

# code but we accept it, especially because there were too many before having

# address all other issues detected by shellcheck.

#shellcheck disable=SC2086



. "$(dirname "${0}")/mptcp_lib.sh"



ret=0
@@ -8,7 +13,6 @@ sin="" 
sout=""

cin=""

cout=""

ksft_skip=4

timeout_poll=30

timeout_test=$((timeout_poll * 2 + 1))

iptables="iptables"
@@ -41,7 +45,7 @@ init() 
	mptcp_lib_ns_init ns1 ns2 ns_sbox



	local i

	for i in `seq 1 4`; do

	for i in $(seq 1 4); do

		ip link add ns1eth$i netns "$ns1" type veth peer name ns2eth$i netns "$ns2"

		ip -net "$ns1" addr add 10.0.$i.1/24 dev ns1eth$i

		ip -net "$ns1" addr add dead:beef:$i::1/64 dev ns1eth$i nodad
@@ -68,6 +72,8 @@ init() 
	add_mark_rules $ns2 2

}



# This function is used in the cleanup trap

#shellcheck disable=SC2317

cleanup()

{

	mptcp_lib_ns_exit "${ns1}" "${ns2}" "${ns_sbox}"
@@ -257,12 +263,12 @@ do_tcpinq_test() 
	local lret=$?

	if [ $lret -ne 0 ];then

		ret=$lret

		echo "FAIL: mptcp_inq $@" 1>&2

		echo "FAIL: mptcp_inq $*" 1>&2

		mptcp_lib_result_fail "TCP_INQ: $*"

		return $lret

	fi



	echo "PASS: TCP_INQ cmsg/ioctl $@"

	echo "PASS: TCP_INQ cmsg/ioctl $*"

	mptcp_lib_result_pass "TCP_INQ: $*"

	return $lret

}