All of lore.kernel.org
 help / color / mirror / Atom feed
From: Gang Yan <gang.yan@linux.dev>
To: mptcp@lists.linux.dev
Cc: Gang Yan <yangang@kylinos.cn>
Subject: [PATCH mptcp-next 2/2] selftests: mptcp: simult_flows: set EXIT trap earlier
Date: Fri, 24 Jul 2026 14:52:29 +0800	[thread overview]
Message-ID: <20260724065229.36736-3-gang.yan@linux.dev> (raw)
In-Reply-To: <20260724065229.36736-1-gang.yan@linux.dev>

From: Gang Yan <yangang@kylinos.cn>

Set the EXIT trap for cleanup immediately after creating the temporary
file variables, before the dd commands that fill them and the namespace
init, to ensure cleanup runs on any failure or interruption during the
early setup phase. If either dd fails (e.g. ENOSPC), the temp files
already created are not cleaned up.

Assisted-by: Codex: GLM-5.2
Signed-off-by: Gang Yan <yangang@kylinos.cn>
---
 tools/testing/selftests/net/mptcp/simult_flows.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/tools/testing/selftests/net/mptcp/simult_flows.sh b/tools/testing/selftests/net/mptcp/simult_flows.sh
index 3ea3d1efe32e..b40dea5f9b30 100755
--- a/tools/testing/selftests/net/mptcp/simult_flows.sh
+++ b/tools/testing/selftests/net/mptcp/simult_flows.sh
@@ -62,13 +62,12 @@ setup()
 	sout=$(mktemp)
 	cout=$(mktemp)
 	capout=$(mktemp)
+	trap cleanup EXIT
 	size=$((2 * 2048 * 4096))
 
 	dd if=/dev/zero of=$small bs=4096 count=20 >/dev/null 2>&1
 	dd if=/dev/zero of=$large bs=4096 count=$((size / 4096)) >/dev/null 2>&1
 
-	trap cleanup EXIT
-
 	mptcp_lib_ns_init ns1 ns2 ns3
 
 	if $capture; then
-- 
2.43.0


  parent reply	other threads:[~2026-07-24  6:54 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-07-24  6:52 [PATCH mptcp-next 0/2] selftests: mptcp: some improvement for selftests Gang Yan
2026-07-24  6:52 ` [PATCH mptcp-next 1/2] selftests: mptcp: run fail_test in main shell during join test Gang Yan
2026-07-24  9:28   ` Matthieu Baerts
2026-07-24  9:39     ` gang.yan
2026-07-24  9:48       ` Matthieu Baerts
2026-07-24 10:01         ` gang.yan
2026-07-24 10:02   ` Matthieu Baerts
2026-07-24  6:52 ` Gang Yan [this message]
2026-07-24  9:27   ` [PATCH mptcp-next 2/2] selftests: mptcp: simult_flows: set EXIT trap earlier Matthieu Baerts
2026-07-24  9:52     ` gang.yan
2026-07-24 10:01       ` Matthieu Baerts
2026-07-24  7:53 ` [PATCH mptcp-next 0/2] selftests: mptcp: some improvement for selftests MPTCP CI

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20260724065229.36736-3-gang.yan@linux.dev \
    --to=gang.yan@linux.dev \
    --cc=mptcp@lists.linux.dev \
    --cc=yangang@kylinos.cn \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.