Squash to "selftests: mptcp: userspace pm subflow tests"

[PATCH mptcp-next] Squash to "selftests: mptcp: userspace pm subflow tests"

Geliang Tang posted 1 patch 3 years, 2 months ago

Download mbox

Failed in applying to current master (apply log)

tools/testing/selftests/net/mptcp/mptcp_join.sh | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

Expand all Fold all

[PATCH mptcp-next] Squash to "selftests: mptcp: userspace pm subflow tests"

Posted by Geliang Tang 3 years, 2 months ago

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