tools/testing/selftests/net/mptcp/mptcp_join.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
This following code appeared in another commit "selftests: mptcp: add infinite map
mibs check":
echo -n " - fclzrx"
- count=`ip netns exec $ns1 nstat -as | grep MPTcpExtMPFastcloseRx | awk '{print $2}'`
+ count=$(ip netns exec $ns1 nstat -as | grep MPTcpExtMPFastcloseRx | awk '{print $2}')
[ -z "$count" ] && count=0
if [ "$count" != "$fclose_rx" ]; then
echo "[fail] got $count MP_FASTCLOSE[s] RX expected $fclose_rx"
It's better to squash it here. With this patch, it will be dropped from the commit
"selftests: mptcp: add infinite map mibs check" automatically.
Signed-off-by: Geliang Tang <geliang.tang@suse.com>
---
tools/testing/selftests/net/mptcp/mptcp_join.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testing/selftests/net/mptcp/mptcp_join.sh
index 7d414cff02a0..10339a796325 100755
--- a/tools/testing/selftests/net/mptcp/mptcp_join.sh
+++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh
@@ -800,7 +800,7 @@ chk_fclose_nr()
local dump_stats
printf "%-${nr_blank}s %s" " " "ctx"
- count=`ip netns exec $ns2 nstat -as | grep MPTcpExtMPFastcloseTx | awk '{print $2}'`
+ count=$(ip netns exec $ns2 nstat -as | grep MPTcpExtMPFastcloseTx | awk '{print $2}')
[ -z "$count" ] && count=0
if [ "$count" != "$fclose_tx" ]; then
echo "[fail] got $count MP_FASTCLOSE[s] TX expected $fclose_tx"
@@ -811,7 +811,7 @@ chk_fclose_nr()
fi
echo -n " - fclzrx"
- count=`ip netns exec $ns1 nstat -as | grep MPTcpExtMPFastcloseRx | awk '{print $2}'`
+ count=$(ip netns exec $ns1 nstat -as | grep MPTcpExtMPFastcloseRx | awk '{print $2}')
[ -z "$count" ] && count=0
if [ "$count" != "$fclose_rx" ]; then
echo "[fail] got $count MP_FASTCLOSE[s] RX expected $fclose_rx"
--
2.34.1
Hi Geliang, Mat, On 24/02/2022 00:35, Geliang Tang wrote: > This following code appeared in another commit "selftests: mptcp: add infinite map > mibs check": > > echo -n " - fclzrx" > - count=`ip netns exec $ns1 nstat -as | grep MPTcpExtMPFastcloseRx | awk '{print $2}'` > + count=$(ip netns exec $ns1 nstat -as | grep MPTcpExtMPFastcloseRx | awk '{print $2}') > [ -z "$count" ] && count=0 > if [ "$count" != "$fclose_rx" ]; then > echo "[fail] got $count MP_FASTCLOSE[s] RX expected $fclose_rx" > > It's better to squash it here. With this patch, it will be dropped from the commit > "selftests: mptcp: add infinite map mibs check" automatically. Thank you for having catch that and thank you for the patch and review! - 73df33204c5f: "squashed" in "selftests: mptcp: add the MP_FASTCLOSE mibs check" - Results: b87ff0ea9dce..4bbd9add0797 Builds and tests are now in progress: https://cirrus-ci.com/github/multipath-tcp/mptcp_net-next/export/20220224T125917 https://github.com/multipath-tcp/mptcp_net-next/actions/workflows/build-validation.yml?query=branch:export Cheers, Matt -- Tessares | Belgium | Hybrid Access Solutions www.tessares.net
On Thu, 24 Feb 2022, Geliang Tang wrote: > This following code appeared in another commit "selftests: mptcp: add infinite map > mibs check": > > echo -n " - fclzrx" > - count=`ip netns exec $ns1 nstat -as | grep MPTcpExtMPFastcloseRx | awk '{print $2}'` > + count=$(ip netns exec $ns1 nstat -as | grep MPTcpExtMPFastcloseRx | awk '{print $2}') > [ -z "$count" ] && count=0 > if [ "$count" != "$fclose_rx" ]; then > echo "[fail] got $count MP_FASTCLOSE[s] RX expected $fclose_rx" > > It's better to squash it here. With this patch, it will be dropped from the commit > "selftests: mptcp: add infinite map mibs check" automatically. > Hi Geliang, I agree, looks good to squash. -Mat > Signed-off-by: Geliang Tang <geliang.tang@suse.com> > --- > tools/testing/selftests/net/mptcp/mptcp_join.sh | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testing/selftests/net/mptcp/mptcp_join.sh > index 7d414cff02a0..10339a796325 100755 > --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh > +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh > @@ -800,7 +800,7 @@ chk_fclose_nr() > local dump_stats > > printf "%-${nr_blank}s %s" " " "ctx" > - count=`ip netns exec $ns2 nstat -as | grep MPTcpExtMPFastcloseTx | awk '{print $2}'` > + count=$(ip netns exec $ns2 nstat -as | grep MPTcpExtMPFastcloseTx | awk '{print $2}') > [ -z "$count" ] && count=0 > if [ "$count" != "$fclose_tx" ]; then > echo "[fail] got $count MP_FASTCLOSE[s] TX expected $fclose_tx" > @@ -811,7 +811,7 @@ chk_fclose_nr() > fi > > echo -n " - fclzrx" > - count=`ip netns exec $ns1 nstat -as | grep MPTcpExtMPFastcloseRx | awk '{print $2}'` > + count=$(ip netns exec $ns1 nstat -as | grep MPTcpExtMPFastcloseRx | awk '{print $2}') > [ -z "$count" ] && count=0 > if [ "$count" != "$fclose_rx" ]; then > echo "[fail] got $count MP_FASTCLOSE[s] RX expected $fclose_rx" > -- > 2.34.1 > > > -- Mat Martineau Intel
© 2016 - 2024 Red Hat, Inc.