* [PATCH mptcp-next] Squash to "selftests: mptcp: userspace pm address tests"
@ 2022-06-21 1:59 Geliang Tang
2022-06-21 1:59 ` [PATCH mptcp-next] Squash to "selftests: mptcp: userspace pm subflow tests" Geliang Tang
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Geliang Tang @ 2022-06-21 1:59 UTC (permalink / raw)
To: mptcp; +Cc: Geliang Tang
Use kill_wait() helper as Mat suggested.
Signed-off-by: Geliang Tang <geliang.tang@suse.com>
---
tools/testing/selftests/net/mptcp/mptcp_join.sh | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testing/selftests/net/mptcp/mptcp_join.sh
index 977c59c540b2..d889e7507cd9 100755
--- a/tools/testing/selftests/net/mptcp/mptcp_join.sh
+++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh
@@ -455,6 +455,12 @@ wait_mpj()
done
}
+kill_wait()
+{
+ kill $1 > /dev/null 2>&1
+ wait $1 2>/dev/null
+}
+
pm_nl_set_limits()
{
local ns=$1
@@ -917,8 +923,7 @@ do_transfer()
fi
if [ $userspace_pm -eq 1 ]; then
- kill $evts_ns1_pid
- wait $evts_ns1_pid 2>/dev/null
+ kill_wait $evts_ns1_pid
rm -rf $evts_ns1
fi
--
2.35.3
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH mptcp-next] Squash to "selftests: mptcp: userspace pm subflow tests"
2022-06-21 1:59 [PATCH mptcp-next] Squash to "selftests: mptcp: userspace pm address tests" Geliang Tang
@ 2022-06-21 1:59 ` Geliang Tang
2022-06-21 22:15 ` [PATCH mptcp-next] Squash to "selftests: mptcp: userspace pm address tests" Mat Martineau
2022-06-22 20:58 ` Matthieu Baerts
2 siblings, 0 replies; 4+ messages in thread
From: Geliang Tang @ 2022-06-21 1:59 UTC (permalink / raw)
To: mptcp; +Cc: Geliang Tang
Use kill_wait() helper as Mat suggested.
Signed-off-by: Geliang Tang <geliang.tang@suse.com>
---
tools/testing/selftests/net/mptcp/mptcp_join.sh | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testing/selftests/net/mptcp/mptcp_join.sh
index 50b6e1ec2f3a..55efe2aafb84 100755
--- a/tools/testing/selftests/net/mptcp/mptcp_join.sh
+++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh
@@ -949,8 +949,7 @@ do_transfer()
if [ $userspace_pm -eq 1 ]; then
kill_wait $evts_ns1_pid
- kill $evts_ns2_pid
- wait $evts_ns2_pid 2>/dev/null
+ kill_wait $evts_ns2_pid
rm -rf $evts_ns1 $evts_ns2
fi
--
2.35.3
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH mptcp-next] Squash to "selftests: mptcp: userspace pm address tests"
2022-06-21 1:59 [PATCH mptcp-next] Squash to "selftests: mptcp: userspace pm address tests" Geliang Tang
2022-06-21 1:59 ` [PATCH mptcp-next] Squash to "selftests: mptcp: userspace pm subflow tests" Geliang Tang
@ 2022-06-21 22:15 ` Mat Martineau
2022-06-22 20:58 ` Matthieu Baerts
2 siblings, 0 replies; 4+ messages in thread
From: Mat Martineau @ 2022-06-21 22:15 UTC (permalink / raw)
To: Geliang Tang; +Cc: mptcp
On Tue, 21 Jun 2022, Geliang Tang wrote:
> Use kill_wait() helper as Mat suggested.
>
> Signed-off-by: Geliang Tang <geliang.tang@suse.com>
In the rest of that thread, Matthieu and I discussed this being optional -
but now that you've done the work, it's fine with me to squash these.
- Mat
> ---
> tools/testing/selftests/net/mptcp/mptcp_join.sh | 9 +++++++--
> 1 file changed, 7 insertions(+), 2 deletions(-)
>
> diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testing/selftests/net/mptcp/mptcp_join.sh
> index 977c59c540b2..d889e7507cd9 100755
> --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh
> +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh
> @@ -455,6 +455,12 @@ wait_mpj()
> done
> }
>
> +kill_wait()
> +{
> + kill $1 > /dev/null 2>&1
> + wait $1 2>/dev/null
> +}
> +
> pm_nl_set_limits()
> {
> local ns=$1
> @@ -917,8 +923,7 @@ do_transfer()
> fi
>
> if [ $userspace_pm -eq 1 ]; then
> - kill $evts_ns1_pid
> - wait $evts_ns1_pid 2>/dev/null
> + kill_wait $evts_ns1_pid
> rm -rf $evts_ns1
> fi
>
> --
> 2.35.3
>
>
>
--
Mat Martineau
Intel
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH mptcp-next] Squash to "selftests: mptcp: userspace pm address tests"
2022-06-21 1:59 [PATCH mptcp-next] Squash to "selftests: mptcp: userspace pm address tests" Geliang Tang
2022-06-21 1:59 ` [PATCH mptcp-next] Squash to "selftests: mptcp: userspace pm subflow tests" Geliang Tang
2022-06-21 22:15 ` [PATCH mptcp-next] Squash to "selftests: mptcp: userspace pm address tests" Mat Martineau
@ 2022-06-22 20:58 ` Matthieu Baerts
2 siblings, 0 replies; 4+ messages in thread
From: Matthieu Baerts @ 2022-06-22 20:58 UTC (permalink / raw)
To: Geliang Tang, mptcp
Hi Geliang, Mat,
On 21/06/2022 03:59, Geliang Tang wrote:
> Use kill_wait() helper as Mat suggested.
Thank you for the patches and reviews!
- 35df311b36fd: "squashed" in "selftests: mptcp: userspace pm address tests"
- d8492465ee5e: "squashed" in "selftests: mptcp: userspace pm subflow tests"
- Results: 972138d95a98..d99676bfce76 (export)
Builds and tests are now in progress:
https://cirrus-ci.com/github/multipath-tcp/mptcp_net-next/export/20220622T205731
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
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-06-22 20:58 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-06-21 1:59 [PATCH mptcp-next] Squash to "selftests: mptcp: userspace pm address tests" Geliang Tang
2022-06-21 1:59 ` [PATCH mptcp-next] Squash to "selftests: mptcp: userspace pm subflow tests" Geliang Tang
2022-06-21 22:15 ` [PATCH mptcp-next] Squash to "selftests: mptcp: userspace pm address tests" Mat Martineau
2022-06-22 20:58 ` Matthieu Baerts
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).