From nobody Sun Feb 8 07:07:23 2026 Received: from out-172.mta1.migadu.com (out-172.mta1.migadu.com [95.215.58.172]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B193814F6F for ; Tue, 5 Dec 2023 07:04:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="BFbU2hLG" X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1701759840; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=gasvoxRPWicDE3XfhTUoCiRuYSFTQpShWPMiKmswtn0=; b=BFbU2hLGCxoxot/st3QLdzsjcMHurPHUZtvh5yBKjHKhTE36/QkSm8zELOx+dqi78sWyvS XtSNnJazOLgUHeLq9zXiRAzB63IkfqK8dYrbQdeSp/TrHRjR2uLY7HeDf3LzjnPsSj18Iw 9bp53pKkGpfR3nwyiS7m0ZskX64P5d4= From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v5 31/33] selftests: mptcp: export timeout_test to mptcp_lib Date: Tue, 5 Dec 2023 15:01:18 +0800 Message-Id: <0891f05f640a96b51342e6b05c4e899de3f87866.1701759405.git.geliang.tang@linux.dev> In-Reply-To: References: Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Migadu-Flow: FLOW_OUT Content-Type: text/plain; charset="utf-8" Move the variables 'timeout_poll' and 'timeout_test' into mptcp_lib.sh as public variables. Signed-off-by: Geliang Tang --- tools/testing/selftests/net/mptcp/diag.sh | 2 -- tools/testing/selftests/net/mptcp/mptcp_connect.sh | 2 -- tools/testing/selftests/net/mptcp/mptcp_join.sh | 2 -- tools/testing/selftests/net/mptcp/mptcp_lib.sh | 3 +++ tools/testing/selftests/net/mptcp/mptcp_sockopt.sh | 2 -- tools/testing/selftests/net/mptcp/simult_flows.sh | 2 -- 6 files changed, 3 insertions(+), 10 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/diag.sh b/tools/testing/self= tests/net/mptcp/diag.sh index 216123547131..1752cf292588 100755 --- a/tools/testing/selftests/net/mptcp/diag.sh +++ b/tools/testing/selftests/net/mptcp/diag.sh @@ -5,8 +5,6 @@ =20 mptcp_lib_ns_init ksft_skip=3D4 -timeout_poll=3D30 -timeout_test=3D$((timeout_poll * 2 + 1)) =20 flush_pids() { diff --git a/tools/testing/selftests/net/mptcp/mptcp_connect.sh b/tools/tes= ting/selftests/net/mptcp/mptcp_connect.sh index a3f864cb0a02..356cbb2289be 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_connect.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_connect.sh @@ -9,8 +9,6 @@ optstring=3D"S:R:d:e:l:r:h4cm:f:tC" final_ret=3D0 cin_disconnect=3D"" ksft_skip=3D4 -timeout_poll=3D30 -timeout_test=3D$((timeout_poll * 2 + 1)) ipv6=3Dtrue ethtool_random_on=3Dtrue tc_delay=3D"$((RANDOM%50))" diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index db254496b43a..824f2a3ed7c2 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -18,8 +18,6 @@ cinsent=3D"" tmpfile=3D"" capout=3D"" ksft_skip=3D4 -timeout_poll=3D30 -timeout_test=3D$((timeout_poll * 2 + 1)) ip_mptcp=3D0 check_invert=3D0 validate_checksum=3Dfalse diff --git a/tools/testing/selftests/net/mptcp/mptcp_lib.sh b/tools/testing= /selftests/net/mptcp/mptcp_lib.sh index 8c7f181768b3..1f1e8c5e9540 100644 --- a/tools/testing/selftests/net/mptcp/mptcp_lib.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_lib.sh @@ -26,6 +26,9 @@ TEST_NAME=3D"" capture=3Dfalse checksum=3Dfalse =20 +readonly timeout_poll=3D30 +timeout_test=3D$((timeout_poll * 2 + 1)) + MPTCP_LIB_SUBTESTS=3D() =20 sin=3D$(mktemp) diff --git a/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh b/tools/tes= ting/selftests/net/mptcp/mptcp_sockopt.sh index ec829165d562..3305f1a7249b 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh @@ -4,8 +4,6 @@ . "$(dirname "${0}")/mptcp_lib.sh" =20 ksft_skip=3D4 -timeout_poll=3D30 -timeout_test=3D$((timeout_poll * 2 + 1)) =20 mptcp_lib_ns_init =20 diff --git a/tools/testing/selftests/net/mptcp/simult_flows.sh b/tools/test= ing/selftests/net/mptcp/simult_flows.sh index 34981e88e129..dd249ba32cc2 100755 --- a/tools/testing/selftests/net/mptcp/simult_flows.sh +++ b/tools/testing/selftests/net/mptcp/simult_flows.sh @@ -5,8 +5,6 @@ =20 mptcp_lib_ns_init ksft_skip=3D4 -timeout_poll=3D30 -timeout_test=3D$((timeout_poll * 2 + 1)) bail=3D0 slack=3D50 large=3D"" --=20 2.35.3