tools/testing/selftests/net/mptcp/mptcp_join.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
Please update the commit log:
'''
Instead of using a global variable mptcp_connect, this patch added
a new local variable extra_args in do_transfer() to store the extra
argments passing to the mptcp_connect commands.
This patch also renamed the speed level 'least' to 'speed_*'. This
more flexible way can avoid the need to add new speed levels in the
future.
'''
Signed-off-by: Geliang Tang <geliang.tang@suse.com>
---
tools/testing/selftests/net/mptcp/mptcp_join.sh | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testing/selftests/net/mptcp/mptcp_join.sh
index 8597b4a52f4d..ccb11eeea723 100755
--- a/tools/testing/selftests/net/mptcp/mptcp_join.sh
+++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh
@@ -458,8 +458,8 @@ do_transfer()
extra_args="-j"
elif [ $speed = "slow" ]; then
extra_args="-r 50"
- elif [ $speed = "least" ]; then
- extra_args="-r 10"
+ elif [[ $speed = "speed_"* ]]; then
+ extra_args="-r ${speed:6}"
fi
local local_addr
@@ -1551,7 +1551,7 @@ add_addr_timeout_tests()
pm_nl_add_endpoint $ns1 10.0.2.1 flags signal
pm_nl_add_endpoint $ns1 10.0.3.1 flags signal
pm_nl_set_limits $ns2 2 2
- run_tests $ns1 $ns2 10.0.1.1 0 0 0 least
+ run_tests $ns1 $ns2 10.0.1.1 0 0 0 speed_10
chk_join_nr "signal addresses, ADD_ADDR timeout" 2 2 2
chk_add_nr 8 0
@@ -1561,7 +1561,7 @@ add_addr_timeout_tests()
pm_nl_add_endpoint $ns1 10.0.12.1 flags signal
pm_nl_add_endpoint $ns1 10.0.3.1 flags signal
pm_nl_set_limits $ns2 2 2
- run_tests $ns1 $ns2 10.0.1.1 0 0 0 least
+ run_tests $ns1 $ns2 10.0.1.1 0 0 0 speed_10
chk_join_nr "invalid address, ADD_ADDR timeout" 1 1 1
chk_add_nr 8 0
}
--
2.34.1
On Fri, 18 Feb 2022, Geliang Tang wrote: > Please update the commit log: > > ''' > Instead of using a global variable mptcp_connect, this patch added > a new local variable extra_args in do_transfer() to store the extra > argments passing to the mptcp_connect commands. > > This patch also renamed the speed level 'least' to 'speed_*'. This > more flexible way can avoid the need to add new speed levels in the > future. > ''' > Looks ok to squash, thanks. -Mat > Signed-off-by: Geliang Tang <geliang.tang@suse.com> > --- > tools/testing/selftests/net/mptcp/mptcp_join.sh | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testing/selftests/net/mptcp/mptcp_join.sh > index 8597b4a52f4d..ccb11eeea723 100755 > --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh > +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh > @@ -458,8 +458,8 @@ do_transfer() > extra_args="-j" > elif [ $speed = "slow" ]; then > extra_args="-r 50" > - elif [ $speed = "least" ]; then > - extra_args="-r 10" > + elif [[ $speed = "speed_"* ]]; then > + extra_args="-r ${speed:6}" > fi > > local local_addr > @@ -1551,7 +1551,7 @@ add_addr_timeout_tests() > pm_nl_add_endpoint $ns1 10.0.2.1 flags signal > pm_nl_add_endpoint $ns1 10.0.3.1 flags signal > pm_nl_set_limits $ns2 2 2 > - run_tests $ns1 $ns2 10.0.1.1 0 0 0 least > + run_tests $ns1 $ns2 10.0.1.1 0 0 0 speed_10 > chk_join_nr "signal addresses, ADD_ADDR timeout" 2 2 2 > chk_add_nr 8 0 > > @@ -1561,7 +1561,7 @@ add_addr_timeout_tests() > pm_nl_add_endpoint $ns1 10.0.12.1 flags signal > pm_nl_add_endpoint $ns1 10.0.3.1 flags signal > pm_nl_set_limits $ns2 2 2 > - run_tests $ns1 $ns2 10.0.1.1 0 0 0 least > + run_tests $ns1 $ns2 10.0.1.1 0 0 0 speed_10 > chk_join_nr "invalid address, ADD_ADDR timeout" 1 1 1 > chk_add_nr 8 0 > } > -- > 2.34.1 > > > -- Mat Martineau Intel
© 2016 - 2024 Red Hat, Inc.