mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-29 05:44:11 +00:00
Code Issues Releases Wiki Activity

selftests: mptcp: set all env vars as local ones

Browse source 
It would be better to move the declaration of all the env variables to
do_transfer(), run_tests(), or pm_nl_set_endpoint() as local variables,
instead of exporting them globally at the beginning of the file.

Signed-off-by: Geliang Tang <geliang.tang@suse.com>
Reviewed-by: Matthieu Baerts <matthieu.baerts@tessares.net>
Signed-off-by: Matthieu Baerts <matthieu.baerts@tessares.net>
Link: https://lore.kernel.org/r/20230712-upstream-net-next-20230712-selftests-mptcp-use-local-env-v1-1-f1c8b62fbf95@tessares.net
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Geliang Tang 2023-07-12 18:03:16 +02:00 committed by Jakub Kicinski
parent d2afa89f66
commit 662aa22d7d
1 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
tools/testing/selftests/net/mptcp/mptcp_join.sh
View file

@ -49,11 +49,12 @@ TEST_COUNT=0
TEST_NAME=""
nr_blank=40
export FAILING_LINKS=""
export test_linkfail=0
export addr_nr_ns1=0
export addr_nr_ns2=0
export sflags=""
# These var are used only in some tests, make sure they are not already set
unset FAILING_LINKS
unset test_linkfail
unset addr_nr_ns1
unset addr_nr_ns2
unset sflags
# generated using "nfbpf_compile '(ip && (ip[54] & 0xf0) == 0x30) ||
# (ip6 && (ip6[74] & 0xf0) == 0x30)'"
@ -100,7 +101,6 @@ init_partial()
stats_dumped=0
check_invert=0
validate_checksum=$checksum
FAILING_LINKS=""
# ns1 ns2
# ns1eth1 ns2eth1
@ -828,6 +828,10 @@ pm_nl_set_endpoint()
local connector_ns="$2"
local connect_addr="$3"
local addr_nr_ns1=${addr_nr_ns1:-0}
local addr_nr_ns2=${addr_nr_ns2:-0}
local sflags=${sflags:-""}
# let the mptcp subflow be established in background before
# do endpoint manipulation
if [ $addr_nr_ns1 != "0" ] || [ $addr_nr_ns2 != "0" ]; then
@ -979,6 +983,7 @@ do_transfer()
local port=$((10000 + TEST_COUNT - 1))
local cappid
local FAILING_LINKS=${FAILING_LINKS:-""}
:> "$cout"
:> "$sout"
@ -1158,6 +1163,7 @@ run_tests()
local speed="${4:-fast}"
local size
local test_linkfail=${test_linkfail:-0}
# The values above 2 are reused to make test files
# with the given sizes (KB)