From nobody Sat May 18 15:08:20 2024 Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on2048.outbound.protection.outlook.com [40.107.21.48]) (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 99302199B1 for ; Wed, 8 Nov 2023 14:12:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=suse.com header.i=@suse.com header.b="WtPSKMof" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=oWmBcOGKEXOyN+Ao442XiU3huAYnZzFVpY2gOSaxHyeNhclWUqQH492T35Y+ioOhKqE48FyaflIkroQu3F09HsclW6yVOv/OAW1khDO+HjY3CfiILqyaJcc/slaVv4M440U8gPZL/jI8f8Sera3ZayVXgxSKOLysep0yxoVOUd42pEP+JJr8TefvL18emfEjeDjt3pRiuPKyjagJbGxy2fvaskM2t6BIFhyWAh9BZF/sKGZh3TsnUYk3sHgEKQH2Yo49WvFyCF2P8Tc8WKTyPYUm+SnkjKle501z4uj21mrZmbzh5fj7QPWtZA7EXL0jjnoyW7B4IdMuZ08OwXSM1A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=HM4RxoPJZwDGutbcG61F6Se288v8pVVi6psQOSacEc4=; b=CemIRCw/Y9MFI/ScMoqFfVLFKi/R+sGn9orSNnh121w2+xs6txRB4BmdZ15uPIumiBJmrJS5cFzFsQa0vz+ftFpTQhA3HSpG/LZkBqCR3iJZ3LZUtdPCvZMVI8mxkXydX3O9wOrCsQDP9zwLuMbALKGIrzZTwiLo9P17gCHJSs2nJbNP+uRA148dOAMhm/eUMdLz49ZrgGEdyCVqCRU3UBgL6v5tDyOfwuflZS5/O93blUcIBBnOKjpFP7r6eAdZbjS5g3BMHx9V52nU7kztQN30JoTIFm2hwOhDR88hFEyERrzB8iYwgxN03gb8XTg3l0VrdcQloYZarWJzYNPv/w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=HM4RxoPJZwDGutbcG61F6Se288v8pVVi6psQOSacEc4=; b=WtPSKMof55onb2ECCT5EcZiVxMVBIp3frZsosHwywnyqPCjtpnMKjadoVwml04iV62UDtKhDQnFTIE8WtTriadFBF04KBjvk3bNU/pOyvYqi75NBamarIubXWo/gasoVKYg8NUXtyeJUscARBjq7j7JwjEY/P76RbVQRTXd0KxBabzy70wk3Mm7r3DgyW6P87Z9scbqJtbFV5jS+6evb40XDjk1LsPjoBFXEE0n7HmpmJqZZvEmFwKEdwYznratKpJpmiooArwXkWf9ZtCvNyXmAv6qXVQHUjw+GmEft83ysvDzfkFkwTpvjtgPsZGi9l4M747ilR2nBtLRMlSTniw== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) by VI1PR04MB10050.eurprd04.prod.outlook.com (2603:10a6:800:1db::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6954.19; Wed, 8 Nov 2023 14:12:07 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::7102:259:f268:5321]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::7102:259:f268:5321%6]) with mapi id 15.20.6977.011; Wed, 8 Nov 2023 14:12:06 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next 01/13] selftests: mptcp: add mptcp_lib_evts_* helpers Date: Wed, 8 Nov 2023 22:11:42 +0800 Message-Id: <9d3ef16b3027c701f1d634565c8e3b6f6886d563.1699452144.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SG2PR06CA0196.apcprd06.prod.outlook.com (2603:1096:4:1::28) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: HE1PR0402MB3497:EE_|VI1PR04MB10050:EE_ X-MS-Office365-Filtering-Correlation-Id: 2100d574-ca2b-48b5-e9ce-08dbe064b06e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: hwePkQCja+VqWCmiDPIwjn49SbyPjXHtQC8HiMCMaqxNdsywlHiT28Fa8TReytTcGtnLl9n7uwbB2VE+8g64vf5u54s7JDeevgS80NvByBD3gguKEZfTTGpqrfzPofQNYMjReEyhzWp2yUORJ6KfL1TDA9iwgpal6hZdadSfEQRLdYN7lSuuQsILnt5X1uQyTa/Jcr+8aJjcCR3GF07MghpYJU4xPvrdKrswpZL331O3LkU/Zw8hb+XKpRApDyNWUnm+hjYLn3iURFLQHZFOtkPH0CvRGkcVpgMUv51r/yFO3HfBsNz6dMb1XGG0sjsbVDOmxBCNkzpBcapF84RAQ2rkfpx7sgCVqvzCNOH5Kkwtk0WlRtt/bNNBUi6dCRCvGcFviBTJCDX+BsB4DHk29DfOaUMFVBPexMG8x0IxVDx5ANNbxYXAyLmFL7zK4B0JSpsg19cQukuH5I2M0sDEeySaD5ZIfMsWdERYEHhU+ntVD1ydRbJWO5fMnSAGIBeDmbGjM0HH7aYaghh1wiO+fi192eJCrynGrKws7TeCAZ5ylAMz680GYIv1YdY6IxAb X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(136003)(39850400004)(346002)(366004)(396003)(376002)(230922051799003)(186009)(1800799009)(64100799003)(451199024)(26005)(478600001)(6512007)(107886003)(6666004)(6506007)(83380400001)(4326008)(44832011)(5660300002)(66476007)(66556008)(41300700001)(6916009)(8936002)(8676002)(6486002)(316002)(66946007)(2616005)(38100700002)(2906002)(36756003)(86362001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?6GOumpN3cQdK7X41xvcLTPeDhzkS+/9sb0sKCx9iHG9durAvHpdZha8MP/ra?= =?us-ascii?Q?3RR4LGkp36Dx9S1hgwYfnzHqtwh869E/7Yi5rUfimdNDyevsEBvuuAxuGAM2?= =?us-ascii?Q?LpW0VjN+5dIoS8RUDJacsFMbIIue0WgSxaXhGpZXXo2X0bFlJOoaR5f7tHYT?= =?us-ascii?Q?kUaspMEmTuIhPzwkc4nEog4eBsJqst9mM/ZGgT/7gMp8oqy7AVG+pTCRUGet?= =?us-ascii?Q?WDV2qpP3sHJhlFkN030JAygxCwud5wTP+aFu+kfb2pOjAb8JkuSAAB++AYV2?= =?us-ascii?Q?8liTSRpJOlTWZrrJ2CTs8ZzxDz/aphigquRIMSsYi/0y8qaUMFIcLNWhyaxq?= =?us-ascii?Q?TqYHssLAnrt3AOdXSvWcfQbbEYHKpM/jclMNrqI/D8T6ugc69zicOCKfWjTk?= =?us-ascii?Q?wHyUJ7MBEngQBZQzsEeftWT7EqYiX7yGbuQouPxEmfk8P2THDVIO3unF3IEP?= =?us-ascii?Q?ajPH4JigiQTgFy0IlMvxcdFWUb/infmgeykRZ3OZp2jEDXNvpS1M+J0KKb7W?= =?us-ascii?Q?jPOuDroCdgd+7cto6qaXX4RG78rBUym+WiK9RcfcFfGBGTRBzRy0na5jm3aP?= =?us-ascii?Q?y71J17OJI9rJsSqTkS2Q1YDrbInutwPP+zzxIbFflsTNR3DqZszHF8wX9UH7?= =?us-ascii?Q?a1+0P7rjjb6/adTZny/d6sCRTUJUAHjYGnYGciK4x7SiITMpxfFPHAOr5B+R?= =?us-ascii?Q?+9kCfW0QxhE6os7W7eWHK+wnNzXJX98Z6atCGWOlo+nFPfIIiIbihCTTN4F+?= =?us-ascii?Q?AxGYjkx+R8DzuUu4x98IZRGQqgLiVxDwx7LhKN12dQDJ0xzzF3A7gxv7TAyv?= =?us-ascii?Q?YuEujprlsIZiYP794gnMeL50PxgiPq5E18mzzA65jjhrbnup1L9S73XDiZLp?= =?us-ascii?Q?7kBDMeYX+KF6zG9D0qQFNepZuidIvw15yTHVqILvTlYFZm417lFAIm0v/1bq?= =?us-ascii?Q?uDBUYNH2PmpvWjN/3k447tb8IHC9RPXDVnCY6NNI0yH8/YAHpxtG4tPdkQNc?= =?us-ascii?Q?GguYGDaL7l1eF7VRzz25VqRbtl2OP64lGQzGMABryEvKBfa0zhLNoR8acnKa?= =?us-ascii?Q?hy2z1g3HdsovAJgqYD8T93jiYPHECIx3y24gGynbh0cDlmrGEbJQyIqqYZVC?= =?us-ascii?Q?e9xxrM8TUX5Hp2kYw/laqFB9hI9pbxrZz9erndtD487lfStgCfJ9BOVJ5VW8?= =?us-ascii?Q?WO7FYPyNf8M5gS070ZUqodJV4g3CBwTYe+SgPRmsQ0R9WeKzX0PQWMO2ymMO?= =?us-ascii?Q?lGCaH1etZs5vpcRkMzOotwtTat9XD2OEhGsI+GNbhA767n43DHtpIU1kC1i1?= =?us-ascii?Q?Pmsd7WoqMmiqXzaXrhG6F5ZGd6QXMqrmKB+W0TinNMIaXasRyY1fh+zKj9qV?= =?us-ascii?Q?znKBUk6VUssGawTdKWAW4hBmsIMkJm2Wb1Spfkdinra4oCYv2HLwlA57jYfw?= =?us-ascii?Q?wTzchveTs6wxyYeLChlJuSTOiydvhjKYH5jFIcunY2lFfZU8XiW7Ztndia1E?= =?us-ascii?Q?A3kR6QITnlbTmlcHaLweO5fdIeUirATEunzxxg6QNsHlCKQ1z742u6Hn9ENg?= =?us-ascii?Q?75XU/Whhh4lz5s79ztjCrqO7d9lQCYfHc1QtZMLj?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2100d574-ca2b-48b5-e9ce-08dbe064b06e X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Nov 2023 14:12:06.7296 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: HbMb6QczoYG4WSwYSG2ENiLSoySVKeaRmF+umw8zjVUFIQ7gCKmOWZP8OPAt/R/i60aFMMIx5vZYT9hLlGHoEQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB10050 Content-Type: text/plain; charset="utf-8" To avoid duplicated code in different MPTCP selftests, we can add and use helpers defined in mptcp_lib.sh. This patch unifies "pm_nl_ctl events" related code in userspace_pm.sh and mptcp_join.sh into four helpers: mptcp_lib_evts_init, _start, _kill and _remove. Define them in mptcp_lib.sh and use these new helpers in both scripts. Signed-off-by: Geliang Tang --- .../testing/selftests/net/mptcp/mptcp_join.sh | 54 ++++++---------- .../testing/selftests/net/mptcp/mptcp_lib.sh | 63 +++++++++++++++++++ .../selftests/net/mptcp/userspace_pm.sh | 31 ++------- 3 files changed, 88 insertions(+), 60 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index 995280882428..ac7cee3f4dac 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -35,10 +35,6 @@ ip_mptcp=3D0 check_invert=3D0 validate_checksum=3D0 init=3D0 -evts_ns1=3D"" -evts_ns2=3D"" -evts_ns1_pid=3D0 -evts_ns2_pid=3D0 last_test_failed=3D0 last_test_skipped=3D0 last_test_ignored=3D1 @@ -182,8 +178,7 @@ init() { cin=3D$(mktemp) cinsent=3D$(mktemp) cout=3D$(mktemp) - evts_ns1=3D$(mktemp) - evts_ns2=3D$(mktemp) + mptcp_lib_evts_init =20 trap cleanup EXIT =20 @@ -196,7 +191,7 @@ cleanup() rm -f "$cin" "$cout" "$sinfail" rm -f "$sin" "$sout" "$cinsent" "$cinfail" rm -f "$tmpfile" - rm -rf $evts_ns1 $evts_ns2 + mptcp_lib_evts_remove cleanup_partial } =20 @@ -460,12 +455,7 @@ reset_with_events() { reset "${1}" || return 1 =20 - :> "$evts_ns1" - :> "$evts_ns2" - ip netns exec $ns1 ./pm_nl_ctl events >> "$evts_ns1" 2>&1 & - evts_ns1_pid=3D$! - ip netns exec $ns2 ./pm_nl_ctl events >> "$evts_ns2" 2>&1 & - evts_ns2_pid=3D$! + mptcp_lib_evts_start "${ns1}" "${ns2}" } =20 reset_with_tcp_filter() @@ -635,12 +625,6 @@ wait_mpj() done } =20 -kill_events_pids() -{ - mptcp_lib_kill_wait $evts_ns1_pid - mptcp_lib_kill_wait $evts_ns2_pid -} - kill_tests_wait() { #shellcheck disable=3DSC2046 @@ -2882,9 +2866,9 @@ add_addr_ports_tests() chk_add_nr 1 1 1 chk_rm_nr 1 1 invert =20 - verify_listener_events $evts_ns1 $LISTENER_CREATED $AF_INET 10.0.2.1 101= 00 - verify_listener_events $evts_ns1 $LISTENER_CLOSED $AF_INET 10.0.2.1 10100 - kill_events_pids + verify_listener_events $server_evts $LISTENER_CREATED $AF_INET 10.0.2.1 = 10100 + verify_listener_events $server_evts $LISTENER_CLOSED $AF_INET 10.0.2.1 1= 0100 + mptcp_lib_evts_kill fi =20 # subflow and signal with port, remove @@ -3257,10 +3241,10 @@ fail_tests() # $1: ns ; $2: addr ; $3: id userspace_pm_add_addr() { - local evts=3D$evts_ns1 + local evts=3D$server_evts local tk =20 - [ "$1" =3D=3D "$ns2" ] && evts=3D$evts_ns2 + [ "$1" =3D=3D "$ns2" ] && evts=3D$client_evts tk=3D$(mptcp_lib_evts_get_info token "$evts") =20 ip netns exec $1 ./pm_nl_ctl ann $2 token $tk id $3 @@ -3270,11 +3254,11 @@ userspace_pm_add_addr() # $1: ns ; $2: id userspace_pm_rm_addr() { - local evts=3D$evts_ns1 + local evts=3D$server_evts local tk local cnt =20 - [ "$1" =3D=3D "$ns2" ] && evts=3D$evts_ns2 + [ "$1" =3D=3D "$ns2" ] && evts=3D$client_evts tk=3D$(mptcp_lib_evts_get_info token "$evts") =20 cnt=3D$(rm_addr_count ${1}) @@ -3285,10 +3269,10 @@ userspace_pm_rm_addr() # $1: ns ; $2: addr ; $3: id userspace_pm_add_sf() { - local evts=3D$evts_ns1 + local evts=3D$server_evts local tk da dp =20 - [ "$1" =3D=3D "$ns2" ] && evts=3D$evts_ns2 + [ "$1" =3D=3D "$ns2" ] && evts=3D$client_evts tk=3D$(mptcp_lib_evts_get_info token "$evts") da=3D$(mptcp_lib_evts_get_info daddr4 "$evts") dp=3D$(mptcp_lib_evts_get_info dport "$evts") @@ -3301,13 +3285,13 @@ userspace_pm_add_sf() # $1: ns ; $2: addr $3: event type userspace_pm_rm_sf() { - local evts=3D$evts_ns1 + local evts=3D$server_evts local t=3D${3:-1} local ip=3D4 local tk da dp sp local cnt =20 - [ "$1" =3D=3D "$ns2" ] && evts=3D$evts_ns2 + [ "$1" =3D=3D "$ns2" ] && evts=3D$client_evts if mptcp_lib_is_v6 $2; then ip=3D6; fi tk=3D$(mptcp_lib_evts_get_info token "$evts") da=3D$(mptcp_lib_evts_get_info "daddr$ip" "$evts" $t) @@ -3415,7 +3399,7 @@ userspace_tests() chk_rm_nr 1 1 invert chk_mptcp_info subflows 0 subflows 0 chk_subflows_total 1 1 - kill_events_pids + mptcp_lib_evts_kill wait $tests_pid fi =20 @@ -3437,7 +3421,7 @@ userspace_tests() chk_rm_nr 1 1 chk_mptcp_info subflows 0 subflows 0 chk_subflows_total 1 1 - kill_events_pids + mptcp_lib_evts_kill wait $tests_pid fi =20 @@ -3456,7 +3440,7 @@ userspace_tests() chk_join_nr 1 1 1 chk_mptcp_info subflows 1 subflows 1 chk_subflows_total 2 2 - kill_events_pids + mptcp_lib_evts_kill wait $tests_pid fi =20 @@ -3480,7 +3464,7 @@ userspace_tests() chk_rst_nr 0 0 invert chk_mptcp_info subflows 1 subflows 1 chk_subflows_total 1 1 - kill_events_pids + mptcp_lib_evts_kill wait $tests_pid fi =20 @@ -3506,7 +3490,7 @@ userspace_tests() chk_rst_nr 0 0 invert chk_mptcp_info subflows 1 subflows 1 chk_subflows_total 1 1 - kill_events_pids + mptcp_lib_evts_kill wait $tests_pid fi } diff --git a/tools/testing/selftests/net/mptcp/mptcp_lib.sh b/tools/testing= /selftests/net/mptcp/mptcp_lib.sh index 1f8be9dd0e20..980ef3dbb6ab 100644 --- a/tools/testing/selftests/net/mptcp/mptcp_lib.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_lib.sh @@ -299,3 +299,66 @@ mptcp_lib_wait_local_port_listen() { sleep 0.1 done } + +server_evts=3D"" +client_evts=3D"" +server_evts_pid=3D0 +client_evts_pid=3D0 + +# server_evts(_pid) and client_evts(_pid) are needed +# by mptcp_lib_evts_init, _start, _kill and _remove. +mptcp_lib_evts_init() { + : "${server_evts?}" + : "${client_evts?}" + + if [ -z "${server_evts}" ]; then + server_evts=3D$(mktemp) + fi + if [ -z "${client_evts}" ]; then + client_evts=3D$(mktemp) + fi +} + +# $1 ns1, $2 ns2 +mptcp_lib_evts_start() { + : "${server_evts:?}" + : "${client_evts:?}" + : "${server_evts_pid:?}" + : "${client_evts_pid:?}" + + local ns_1=3D"${1}" + local ns_2=3D"${2}" + + :>"$server_evts" + :>"$client_evts" + + if [ "${server_evts_pid}" -ne 0 ]; then + mptcp_lib_kill_wait "${server_evts_pid}" + fi + ip netns exec "${ns_1}" ./pm_nl_ctl events >> "${server_evts}" 2>&1 & + server_evts_pid=3D$! + + if [ "${client_evts_pid}" -ne 0 ]; then + mptcp_lib_kill_wait "${client_evts_pid}" + fi + ip netns exec "${ns_2}" ./pm_nl_ctl events >> "${client_evts}" 2>&1 & + client_evts_pid=3D$! +} + +mptcp_lib_evts_kill() { + : "${server_evts_pid:?}" + : "${client_evts_pid:?}" + + mptcp_lib_kill_wait "${server_evts_pid}" + mptcp_lib_kill_wait "${client_evts_pid}" + + server_evts_pid=3D0 + client_evts_pid=3D0 +} + +mptcp_lib_evts_remove() { + : "${server_evts:?}" + : "${client_evts:?}" + + rm -rf "${server_evts}" "${client_evts}" +} diff --git a/tools/testing/selftests/net/mptcp/userspace_pm.sh b/tools/test= ing/selftests/net/mptcp/userspace_pm.sh index 6167837f48e1..f1dbd97c0c96 100755 --- a/tools/testing/selftests/net/mptcp/userspace_pm.sh +++ b/tools/testing/selftests/net/mptcp/userspace_pm.sh @@ -34,10 +34,6 @@ AF_INET=3D2 AF_INET6=3D10 =20 file=3D"" -server_evts=3D"" -client_evts=3D"" -server_evts_pid=3D0 -client_evts_pid=3D0 client4_pid=3D0 server4_pid=3D0 client6_pid=3D0 @@ -116,18 +112,19 @@ cleanup() =20 # Terminate the MPTCP connection and related processes local pid - for pid in $client4_pid $server4_pid $client6_pid $server6_pid\ - $server_evts_pid $client_evts_pid + for pid in $client4_pid $server4_pid $client6_pid $server6_pid do mptcp_lib_kill_wait $pid done + mptcp_lib_evts_kill =20 local netns for netns in "$ns1" "$ns2" ;do ip netns del "$netns" done =20 - rm -rf $file $client_evts $server_evts + rm -rf $file + mptcp_lib_evts_remove =20 _printf "Done\n" } @@ -186,24 +183,8 @@ make_connection() =20 # Capture netlink events over the two network namespaces running # the MPTCP client and server - if [ -z "$client_evts" ]; then - client_evts=3D$(mktemp) - fi - :>"$client_evts" - if [ $client_evts_pid -ne 0 ]; then - mptcp_lib_kill_wait $client_evts_pid - fi - ip netns exec "$ns2" ./pm_nl_ctl events >> "$client_evts" 2>&1 & - client_evts_pid=3D$! - if [ -z "$server_evts" ]; then - server_evts=3D$(mktemp) - fi - :>"$server_evts" - if [ $server_evts_pid -ne 0 ]; then - mptcp_lib_kill_wait $server_evts_pid - fi - ip netns exec "$ns1" ./pm_nl_ctl events >> "$server_evts" 2>&1 & - server_evts_pid=3D$! + mptcp_lib_evts_init + mptcp_lib_evts_start "${ns1}" "${ns2}" sleep 0.5 =20 # Run the server --=20 2.35.3 From nobody Sat May 18 15:08:20 2024 Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on2048.outbound.protection.outlook.com [40.107.21.48]) (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 74272199B1 for ; Wed, 8 Nov 2023 14:12:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=suse.com header.i=@suse.com header.b="uyNAqmKg" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=B8OfGmMOj4Oqlo3RVimcIBqp+3mkwdPiN44S210rt0N0RDvtQOJss93xI9TBRh49h+h0DaoAQNfAHLjlMFgrt3SX0x+KCjGoZsqJGtThWIgUkMLKaRnaiBmOqAThjdJXwcGrVL8UsmysGecRu1SHZEL/7QhuZLWybrLDNTeUvxxN71J2Qa8Afg0nh5U5U1DBAUubADugBX0LYFxysqsk6eZPv9xUTXpq+F95TQMt3OTOsD7HxTkwYAW3Es/DLoCIHIjnl0Nt4/g3rPLQ9ebZDKtegaeuxVHbMsCaFufYTb6GurZ3ee8gp8jtDZ6+1e7eBNnQkiLAeoGOnhsWZejsbQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=Ofl6hXM45EmEEPA5+8Ccz5vyTfadoJxLzu7wVowwvrs=; b=H4okABNblJ4ykdy2vMsVnZ3yBDBscrn4Ngj3PcfwVVKlkPeRR6HYwIfBF3dRXCuAzN/w6pIB8RV1puQzMzGt7dd/sDShVMGlKQbRini2z0zncB+wypa4Kh/I4vD++xipBLGh6MHm5qMxqqt5sZ7bqgMtCk7kkfMgyJRwg8yMyjkbqo2SjC2DgqciExaAPJ0zolW9kQTVXo9h3pUVkpJCQ30d9F3rm+NQG8E0dlQV4XfKeaRcwmXr6cWmEhzMqd/Zh1saXcFpoTeAk4oGCtaiDx6/41IVCLUzbjr5OGzqa4KdP0ArI5A3h7n5+0dzrM4u4fzRv4lTHVVC/PBft7J2wg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Ofl6hXM45EmEEPA5+8Ccz5vyTfadoJxLzu7wVowwvrs=; b=uyNAqmKgU9gDwmMs4opcdD72HjGOstWLeU0Pu/5B2Ob3AebbA1of1AdgzKNsBgutyjlJcaWzxnI8TbDppDVxJy1UhXNNloeU9i+/oJuwoeXxJgZO82t+x4XVhidmXzrYurjvZtsco6R8G5xWhEx8pVZsUT+JJ9BvMTjoBwBkQdKL+Wx0H7DHaXuC4cC+Wo9OFBbSM08MerGK23L4Vr1fzxqECYEar36pA7irHvtpdmgLaWkJPHEljRAlCuPiBg3cCxZH3+NCUlo88EuXsepxK3Zn+wuwAg3Dkuj7PeCL1trEFYf5UB++AWVaS313znaq2YB2vghCvWApS7H3srTrAg== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) by VI1PR04MB10050.eurprd04.prod.outlook.com (2603:10a6:800:1db::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6954.19; Wed, 8 Nov 2023 14:12:12 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::7102:259:f268:5321]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::7102:259:f268:5321%6]) with mapi id 15.20.6977.011; Wed, 8 Nov 2023 14:12:12 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next 02/13] selftests: mptcp: export event macros in mptcp_lib Date: Wed, 8 Nov 2023 22:11:43 +0800 Message-Id: <59ade3efe88c15600c1cdc4a62dbda7bae58aee6.1699452144.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SG2PR06CA0201.apcprd06.prod.outlook.com (2603:1096:4:1::33) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: HE1PR0402MB3497:EE_|VI1PR04MB10050:EE_ X-MS-Office365-Filtering-Correlation-Id: 6ca2f87a-690d-4107-fdc0-08dbe064b38f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: RWW/S3+g3hpEvSJ/UgfmVrXQbgAxLq144mfZYTnXl3/dqD5D7tE8arHau0RvZvzCNbeUPn4shy8N1HWR+Qmobept8ePyDmp6zu9m9O/ji22aoB6BVn/E3UT5FL4vn6SSWSyREKyq2CiHMk1Z3djD2efElbI39cq/bgduljMPlw/uZgwBpoXpvmSEaRN4RchIhVunGF8h5tg7NzTYCOJhxOps83yrlLduBWs8j63S21RuxlgLEyKOqT4AYiR4Ku5ucAruoy11n1OdyP/s2xzqhvzDKtuINm/6wCgqHepyNpjuhhhgwUiuLh7Hl6IHeFEKNfv9mhwOldnCmWI7Nv54Jne2ydiVz/kGiQNkq5D0ShNOzd1/rP4V3Ty/FzB67bZ+5A9vkZBrXTWUiiQPTFZj+LG68gPa6L2TnAYgTgapdY1wDUZXxoPElhFaOaT08fZ2Dbc/AdBF78r4yCj275FD6/hUYrfn4pdG+rpv024hY7MZupM8Tu2UcNAdkTesibn4YF5BL5uRc7fDNwWVxS2E2E6/7Aj6xqqYIC+K/8sudFyUPRuzuLJanSOMeeVm0A42 X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(136003)(39850400004)(346002)(366004)(396003)(376002)(230922051799003)(186009)(1800799009)(64100799003)(451199024)(26005)(478600001)(6512007)(107886003)(6666004)(6506007)(83380400001)(4326008)(44832011)(5660300002)(66476007)(66556008)(41300700001)(6916009)(8936002)(30864003)(8676002)(6486002)(316002)(66946007)(2616005)(38100700002)(2906002)(36756003)(86362001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?M6IK/r9ucFbxorTx7iZeeXiSIs8vTZ+2LWPrddLUChseYGq2t/XY8YVxVj4j?= =?us-ascii?Q?xMiqnb5WKAdY94QwS8m2Y7YTjj3axm/86wOa6rUHTgASZgL6G0Kf34lGUdTt?= =?us-ascii?Q?uxo7UOBPtbXQpfA3TxNoF0W820F0bVrFeIhY8qS/PRbmXHrF3w1cRIijosbx?= =?us-ascii?Q?JdtHckTLiZbcE6f3XMGSiakhYVSzvj1KeB9fWHfkPZa87y900tIG9OBz8dmd?= =?us-ascii?Q?9Moqvkk/Xeo6t+kjqRU9/Q6gEzOhcPrNsyWHWBI/mfJKOTa1GQ5xP9kvygrQ?= =?us-ascii?Q?eVwyUARVans8CBC4CQTXbazgsgN9HmvZnmPHJLlBF1o2rVB8VPz6BVKp9doG?= =?us-ascii?Q?DY0BMTO2Bf6JBfRS7ydvNKvAWNh5MzI0JraXmOFm/L69RtReT/npYJ+t7U6d?= =?us-ascii?Q?4RyXAe6nwdaf/VRHsfpvN4oqAQzUPjVwsLLRdRPaH9Y4T1T2GT1sTG1irXgH?= =?us-ascii?Q?CYXLRuPr8ufqZWkep3jAw0RA4sZBBI1+XPSItsc3I5pJOf0URyKPFb7BYQJf?= =?us-ascii?Q?gF629MyLIlGRUnHl/35sR/b6BdaEhRpNnBO9ctQWstUg8jGnjBmIky0guJFA?= =?us-ascii?Q?+CA0xV4lvtv0tlhzyVYpLueJrJ5FyBIY2NjhksCjBGerAsUfgC1TFIE2THlo?= =?us-ascii?Q?wa3WU+izj108S1xt30+kEC8JbRbG3Ac0/Mo6FbOyXAyL0of3rwbAMrYTzadO?= =?us-ascii?Q?v9noxu1cZ3tioUsiuDBTXai9m3mg+6O5fS8ZAYeNjpLPpRR4gymaNDDawt7L?= =?us-ascii?Q?ub1HCx+ow+aIg4pf8GHIg4ysfKiJbFqPjKEpSojdB+A2ERhUeSkTAjzktL3/?= =?us-ascii?Q?YIKLqun1VM9NMEV2UPqu18kSWVCs3ZO4GlVVqHkeB9gA6mS/lM/vjYIVPMCm?= =?us-ascii?Q?SQn3+vq8wdl2RoZvS/VMUkkkYneV7OlHg/5kx+DMXsuQzX3Gv8FjHxroIwuJ?= =?us-ascii?Q?i0hUsf3irLHQyAMLFmoE6VdeF5Qm6OFR8tg9sJowJul1vLhRUgaT9aYfHwen?= =?us-ascii?Q?pb+2qVWStFQtLtOkS3+P7poh5S7CSBSpFGdo14Bdz85pI+h8IDIKPNolE4YL?= =?us-ascii?Q?I5eBkrKn7tgCF6trVb+OQZuQqBGV3FxK9Ww0kX6b/xldeZXCZpWc8sJy5C/3?= =?us-ascii?Q?8I5MtGqnLf7cbl5Ibfd/9Iog9BG7+Q+/0RkcamwjjHTT+neN+OFvUypqSjdx?= =?us-ascii?Q?1YWLo2Wo3Hd8QLrIdor3gKhC/mfW2lKhdV7JCKi0SSm4cYMi/CCSPkE+1DRo?= =?us-ascii?Q?uV4Kxp2bgS+6mmuzG/s/4tL5XG/GTdFfVfvMF9KccjDLJzOveBCesPzz6+wC?= =?us-ascii?Q?AgQ02v0sjL6ANnuEwf7+qpioHISjFvcltD9ZUPbZH/VrP+iVINBCLIks1KYP?= =?us-ascii?Q?jEy2S2qZ5wYrgxQCh29wr3Fjo3zkXxvTnQbOsAl7rsTlek6ikT5jcF25CVvv?= =?us-ascii?Q?bLJrl1+S4FF2mBOZ7BxWDp9yFPsguVGcnu8ObvsTXvohoXMv8kP0KJ+kXY5v?= =?us-ascii?Q?JbNQudJVbZdlVozfmLZi1KFRuT5zUyMP1pBi3J2iYLKVv0tqrEbfYlxHiIt3?= =?us-ascii?Q?olqfcGfPqmivC2aWQXr0JokJXs6C320okzDZVJuw?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6ca2f87a-690d-4107-fdc0-08dbe064b38f X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Nov 2023 14:12:11.9697 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 4xgQ3YFYsZwkBOneZK+ecwU0wEhQaQhqS5oDTDMbf2ZF3rSrCEhoHmXdgUPcf67VdNmk5PHFrPX7Baa2MnU7Jg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB10050 Content-Type: text/plain; charset="utf-8" SUB_ESTABLISHED, LISTENER_CREATED, LISTENER_CLOSED, AF_INET and AF_INET6 are defined in both mptcp_join.sh and userspace_pm.sh, export them into mptcp_lib.sh. Add MPTCP_LIB_ prefix for the first three and add readonly for the last two. Signed-off-by: Geliang Tang --- .../testing/selftests/net/mptcp/mptcp_join.sh | 21 +++---- .../testing/selftests/net/mptcp/mptcp_lib.sh | 7 +++ .../selftests/net/mptcp/userspace_pm.sh | 60 +++++++++---------- 3 files changed, 44 insertions(+), 44 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index ac7cee3f4dac..5c8873bc75e1 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -2777,13 +2777,6 @@ backup_tests() fi } =20 -SUB_ESTABLISHED=3D10 # MPTCP_EVENT_SUB_ESTABLISHED -LISTENER_CREATED=3D15 #MPTCP_EVENT_LISTENER_CREATED -LISTENER_CLOSED=3D16 #MPTCP_EVENT_LISTENER_CLOSED - -AF_INET=3D2 -AF_INET6=3D10 - verify_listener_events() { local evt=3D$1 @@ -2797,9 +2790,9 @@ verify_listener_events() local sport local name =20 - if [ $e_type =3D $LISTENER_CREATED ]; then + if [ $e_type =3D $MPTCP_LIB_LISTENER_CREATED ]; then name=3D"LISTENER_CREATED" - elif [ $e_type =3D $LISTENER_CLOSED ]; then + elif [ $e_type =3D $MPTCP_LIB_LISTENER_CLOSED ]; then name=3D"LISTENER_CLOSED " else name=3D"$e_type" @@ -2866,8 +2859,10 @@ add_addr_ports_tests() chk_add_nr 1 1 1 chk_rm_nr 1 1 invert =20 - verify_listener_events $server_evts $LISTENER_CREATED $AF_INET 10.0.2.1 = 10100 - verify_listener_events $server_evts $LISTENER_CLOSED $AF_INET 10.0.2.1 1= 0100 + verify_listener_events $server_evts $MPTCP_LIB_LISTENER_CREATED \ + $AF_INET 10.0.2.1 10100 + verify_listener_events $server_evts $MPTCP_LIB_LISTENER_CLOSED \ + $AF_INET 10.0.2.1 10100 mptcp_lib_evts_kill fi =20 @@ -3395,7 +3390,7 @@ userspace_tests() chk_subflows_total 2 2 chk_mptcp_info add_addr_signal 1 add_addr_accepted 1 userspace_pm_rm_addr $ns1 10 - userspace_pm_rm_sf $ns1 "::ffff:10.0.2.1" $SUB_ESTABLISHED + userspace_pm_rm_sf $ns1 "::ffff:10.0.2.1" $MPTCP_LIB_SUB_ESTABLISHED chk_rm_nr 1 1 invert chk_mptcp_info subflows 0 subflows 0 chk_subflows_total 1 1 @@ -3417,7 +3412,7 @@ userspace_tests() chk_mptcp_info subflows 1 subflows 1 chk_subflows_total 2 2 userspace_pm_rm_addr $ns2 20 - userspace_pm_rm_sf $ns2 10.0.3.2 $SUB_ESTABLISHED + userspace_pm_rm_sf $ns2 10.0.3.2 $MPTCP_LIB_SUB_ESTABLISHED chk_rm_nr 1 1 chk_mptcp_info subflows 0 subflows 0 chk_subflows_total 1 1 diff --git a/tools/testing/selftests/net/mptcp/mptcp_lib.sh b/tools/testing= /selftests/net/mptcp/mptcp_lib.sh index 980ef3dbb6ab..ffd78187237b 100644 --- a/tools/testing/selftests/net/mptcp/mptcp_lib.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_lib.sh @@ -8,6 +8,13 @@ readonly KSFT_SKIP=3D4 # shellcheck disable=3DSC2155 # declare and assign separately readonly KSFT_TEST=3D$(basename "${0}" | sed 's/\.sh$//g') =20 +MPTCP_LIB_SUB_ESTABLISHED=3D10 # MPTCP_EVENT_SUB_ESTABLISHED +MPTCP_LIB_LISTENER_CREATED=3D15 #MPTCP_EVENT_LISTENER_CREATED +MPTCP_LIB_LISTENER_CLOSED=3D16 #MPTCP_EVENT_LISTENER_CLOSED + +readonly AF_INET=3D2 +readonly AF_INET6=3D10 + MPTCP_LIB_SUBTESTS=3D() =20 # only if supported (or forced) and not disabled, see no-color.org diff --git a/tools/testing/selftests/net/mptcp/userspace_pm.sh b/tools/test= ing/selftests/net/mptcp/userspace_pm.sh index f1dbd97c0c96..5921589f0db9 100755 --- a/tools/testing/selftests/net/mptcp/userspace_pm.sh +++ b/tools/testing/selftests/net/mptcp/userspace_pm.sh @@ -25,13 +25,7 @@ fi =20 ANNOUNCED=3D6 # MPTCP_EVENT_ANNOUNCED REMOVED=3D7 # MPTCP_EVENT_REMOVED -SUB_ESTABLISHED=3D10 # MPTCP_EVENT_SUB_ESTABLISHED SUB_CLOSED=3D11 # MPTCP_EVENT_SUB_CLOSED -LISTENER_CREATED=3D15 #MPTCP_EVENT_LISTENER_CREATED -LISTENER_CLOSED=3D16 #MPTCP_EVENT_LISTENER_CLOSED - -AF_INET=3D2 -AF_INET6=3D10 =20 file=3D"" client4_pid=3D0 @@ -525,7 +519,7 @@ verify_subflow_events() =20 info=3D"${e_saddr} (${e_from}) =3D> ${e_daddr} (${e_to})" =20 - if [ "$e_type" =3D "$SUB_ESTABLISHED" ] + if [ "$e_type" =3D "$MPTCP_LIB_SUB_ESTABLISHED" ] then if [ "$e_family" =3D "$AF_INET6" ] then @@ -582,14 +576,15 @@ test_subflows() ip netns exec "$ns1" ./pm_nl_ctl csf lip 10.0.2.1 lid 23 rip 10.0.2.2\ rport "$client4_port" token "$server4_token" sleep 0.5 - verify_subflow_events $server_evts $SUB_ESTABLISHED $server4_token $AF_IN= ET "10.0.2.1" \ - "10.0.2.2" "$client4_port" "23" "$client_addr_id" "ns1" "ns2" + verify_subflow_events $server_evts $MPTCP_LIB_SUB_ESTABLISHED $server4_to= ken \ + $AF_INET "10.0.2.1" "10.0.2.2" "$client4_port" "23" \ + "$client_addr_id" "ns1" "ns2" =20 # Delete the listener from the client ns, if one was created mptcp_lib_kill_wait $listener_pid =20 local sport - sport=3D$(mptcp_lib_evts_get_info sport "$server_evts" $SUB_ESTABLISHED) + sport=3D$(mptcp_lib_evts_get_info sport "$server_evts" $MPTCP_LIB_SUB_EST= ABLISHED) =20 # DESTROY_SUBFLOW from server to client machine :>"$server_evts" @@ -620,14 +615,14 @@ test_subflows() ip netns exec "$ns1" ./pm_nl_ctl csf lip dead:beef:2::1 lid 23 rip\ dead:beef:2::2 rport "$client6_port" token "$server6_token" sleep 0.5 - verify_subflow_events "$server_evts" "$SUB_ESTABLISHED" "$server6_token" = "$AF_INET6"\ - "dead:beef:2::1" "dead:beef:2::2" "$client6_port" "23"\ - "$client_addr_id" "ns1" "ns2" + verify_subflow_events "$server_evts" "$MPTCP_LIB_SUB_ESTABLISHED" "$serve= r6_token" \ + "$AF_INET6" "dead:beef:2::1" "dead:beef:2::2" "$client6_port" \ + "23" "$client_addr_id" "ns1" "ns2" =20 # Delete the listener from the client ns, if one was created mptcp_lib_kill_wait $listener_pid =20 - sport=3D$(mptcp_lib_evts_get_info sport "$server_evts" $SUB_ESTABLISHED) + sport=3D$(mptcp_lib_evts_get_info sport "$server_evts" $MPTCP_LIB_SUB_EST= ABLISHED) =20 # DESTROY_SUBFLOW6 from server to client machine :>"$server_evts" @@ -659,14 +654,14 @@ test_subflows() ip netns exec "$ns1" ./pm_nl_ctl csf lip 10.0.2.1 lid 23 rip 10.0.2.2 rpo= rt\ $new4_port token "$server4_token" sleep 0.5 - verify_subflow_events "$server_evts" "$SUB_ESTABLISHED" "$server4_token" = "$AF_INET"\ - "10.0.2.1" "10.0.2.2" "$new4_port" "23"\ + verify_subflow_events "$server_evts" "$MPTCP_LIB_SUB_ESTABLISHED" "$serve= r4_token" \ + "$AF_INET" "10.0.2.1" "10.0.2.2" "$new4_port" "23" \ "$client_addr_id" "ns1" "ns2" =20 # Delete the listener from the client ns, if one was created mptcp_lib_kill_wait $listener_pid =20 - sport=3D$(mptcp_lib_evts_get_info sport "$server_evts" $SUB_ESTABLISHED) + sport=3D$(mptcp_lib_evts_get_info sport "$server_evts" $MPTCP_LIB_SUB_EST= ABLISHED) =20 # DESTROY_SUBFLOW from server to client machine :>"$server_evts" @@ -698,13 +693,13 @@ test_subflows() ip netns exec "$ns2" ./pm_nl_ctl csf lip 10.0.2.2 lid 23 rip 10.0.2.1 rpo= rt\ $app4_port token "$client4_token" sleep 0.5 - verify_subflow_events $client_evts $SUB_ESTABLISHED $client4_token $AF_IN= ET "10.0.2.2"\ - "10.0.2.1" "$app4_port" "23" "$server_addr_id" "ns2" "ns1" + verify_subflow_events $client_evts $MPTCP_LIB_SUB_ESTABLISHED $client4_to= ken $AF_INET \ + "10.0.2.2" "10.0.2.1" "$app4_port" "23" "$server_addr_id" "ns2" "= ns1" =20 # Delete the listener from the server ns, if one was created mptcp_lib_kill_wait $listener_pid =20 - sport=3D$(mptcp_lib_evts_get_info sport "$client_evts" $SUB_ESTABLISHED) + sport=3D$(mptcp_lib_evts_get_info sport "$client_evts" $MPTCP_LIB_SUB_EST= ABLISHED) =20 # DESTROY_SUBFLOW from client to server machine :>"$client_evts" @@ -735,7 +730,7 @@ test_subflows() ip netns exec "$ns2" ./pm_nl_ctl csf lip dead:beef:2::2 lid 23 rip\ dead:beef:2::1 rport $app6_port token "$client6_token" sleep 0.5 - verify_subflow_events "$client_evts" "$SUB_ESTABLISHED" "$client6_token"\ + verify_subflow_events "$client_evts" "$MPTCP_LIB_SUB_ESTABLISHED" "$clien= t6_token"\ "$AF_INET6" "dead:beef:2::2"\ "dead:beef:2::1" "$app6_port" "23"\ "$server_addr_id" "ns2" "ns1" @@ -743,7 +738,7 @@ test_subflows() # Delete the listener from the server ns, if one was created mptcp_lib_kill_wait $listener_pid =20 - sport=3D$(mptcp_lib_evts_get_info sport "$client_evts" $SUB_ESTABLISHED) + sport=3D$(mptcp_lib_evts_get_info sport "$client_evts" $MPTCP_LIB_SUB_EST= ABLISHED) =20 # DESTROY_SUBFLOW6 from client to server machine :>"$client_evts" @@ -774,13 +769,14 @@ test_subflows() ip netns exec "$ns2" ./pm_nl_ctl csf lip 10.0.2.2 lid 23 rip 10.0.2.1 rpo= rt\ $new4_port token "$client4_token" sleep 0.5 - verify_subflow_events "$client_evts" "$SUB_ESTABLISHED" "$client4_token" = "$AF_INET"\ - "10.0.2.2" "10.0.2.1" "$new4_port" "23" "$server_addr_id" "ns2" "= ns1" + verify_subflow_events "$client_evts" "$MPTCP_LIB_SUB_ESTABLISHED" "$clien= t4_token" \ + "$AF_INET" "10.0.2.2" "10.0.2.1" "$new4_port" "23" \ + "$server_addr_id" "ns2" "ns1" =20 # Delete the listener from the server ns, if one was created mptcp_lib_kill_wait $listener_pid =20 - sport=3D$(mptcp_lib_evts_get_info sport "$client_evts" $SUB_ESTABLISHED) + sport=3D$(mptcp_lib_evts_get_info sport "$client_evts" $MPTCP_LIB_SUB_EST= ABLISHED) =20 # DESTROY_SUBFLOW from client to server machine :>"$client_evts" @@ -819,14 +815,14 @@ test_subflows_v4_v6_mix() ip netns exec "$ns2" ./pm_nl_ctl csf lip 10.0.2.2 lid 23 rip 10.0.2.1 rpo= rt\ $app6_port token "$client6_token" sleep 0.5 - verify_subflow_events "$client_evts" "$SUB_ESTABLISHED" "$client6_token"\ + verify_subflow_events "$client_evts" "$MPTCP_LIB_SUB_ESTABLISHED" "$clien= t6_token"\ "$AF_INET" "10.0.2.2" "10.0.2.1" "$app6_port" "23"\ "$server_addr_id" "ns2" "ns1" =20 # Delete the listener from the server ns, if one was created mptcp_lib_kill_wait $listener_pid =20 - sport=3D$(mptcp_lib_evts_get_info sport "$client_evts" $SUB_ESTABLISHED) + sport=3D$(mptcp_lib_evts_get_info sport "$client_evts" $MPTCP_LIB_SUB_EST= ABLISHED) =20 # DESTROY_SUBFLOW from client to server machine :>"$client_evts" @@ -888,9 +884,9 @@ verify_listener_events() local saddr local sport =20 - if [ $e_type =3D $LISTENER_CREATED ]; then + if [ $e_type =3D $MPTCP_LIB_LISTENER_CREATED ]; then print_test "CREATE_LISTENER $e_saddr:$e_sport" - elif [ $e_type =3D $LISTENER_CLOSED ]; then + elif [ $e_type =3D $MPTCP_LIB_LISTENER_CLOSED ]; then print_test "CLOSE_LISTENER $e_saddr:$e_sport" fi =20 @@ -925,7 +921,8 @@ test_listener() local listener_pid=3D$! =20 sleep 0.5 - verify_listener_events $client_evts $LISTENER_CREATED $AF_INET 10.0.2.2 $= client4_port + verify_listener_events $client_evts $MPTCP_LIB_LISTENER_CREATED \ + $AF_INET 10.0.2.2 $client4_port =20 # ADD_ADDR from client to server machine reusing the subflow port ip netns exec $ns2 ./pm_nl_ctl ann 10.0.2.2 token $client4_token id\ @@ -941,7 +938,8 @@ test_listener() mptcp_lib_kill_wait $listener_pid =20 sleep 0.5 - verify_listener_events $client_evts $LISTENER_CLOSED $AF_INET 10.0.2.2 $c= lient4_port + verify_listener_events $client_evts $MPTCP_LIB_LISTENER_CLOSED \ + $AF_INET 10.0.2.2 $client4_port } =20 print_title "Make connections" --=20 2.35.3 From nobody Sat May 18 15:08:20 2024 Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on2051.outbound.protection.outlook.com [40.107.21.51]) (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 40AA8199BB for ; Wed, 8 Nov 2023 14:12:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=suse.com header.i=@suse.com header.b="pXjSordS" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZeKo8wNX53fC69gilkaZsIgTfig6JAYyHn3wnYj0CEQ1yp9GTJdn3U1R513+J/g06I26K12N7DKVRxEKh8N2cfMG3ZIS52veDHUacSIfCuEPpE5tKo2MdAaU4WUt2pTc5r/IdvOYudP6T5WZCBRFhUIHwMV78pIwYaLT4egslH7ajkIl6h1STNfQB8K9M7RvL5IvGS2cBvqnz4hdq1vZb36voAxLu4uRf6KuGsC64s2I8dbgWaboQfbdlsiSCO0i2mSQD88QeZGoFa6yiZbK8HNL5xUbFWSaUPVSX9xU7ZgmmCrakc+gtuW/PG6OXtDefJIRDaAFBtqEx/a96WTLiA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=rI4qiIKZCDckmcnp2dIb4hzsbK2MdAb85OkgPEQH/UY=; b=m0/9DI87Eb06wbxvkew4x3hTsMOFAMCym0LdEoZBLSHMDVi9Hxng/eQs80of7J8J4J6tTwl5yynDuVe73wghANIbO4LjtCF5fTI35EVcpRcKuJJL/7qvaQ+4PDdp5Np57EMP5AJ/fM86RFcwVPJyg+0EMv6sCVeVRTxF3NGGGhyLNaATax/gNidcZEKJCr2/zrn9XLsM+8Ick+9TAk4QSTkmmiPB6tmzxBcTD+/ZtUTo5UdYP63oGGYffDXHHOxDZPSh2BN6DTKGJ7vsFeXMRJSE8yk4jrTpYT2yeJEEkrfd885StHXrhWdkuBSXLkh4rnbMo4MgfEuBwb9GzEoEWg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=rI4qiIKZCDckmcnp2dIb4hzsbK2MdAb85OkgPEQH/UY=; b=pXjSordS5QUFjcxRRwzJOaCHKMoTENOcU8VEtL+ZzZTLP9NcpgrswxMT8cGQpbmyOPWTEjFxxKQdExQDmEEx9V+T0y0gyn4BqB7ft6LvVx3RlHXAojnobCTKP05RcAkNa5f++tIlXXuqn1n5YrNVvAuC3Uo/M1xxf0NnTnGfKnjPUbrF0GMZUKvTHOt7ToEgwlajJRf/yS4dKd7eDisADYTEFd3h+vKo4svpwjmdA00TOfEBVuvud90AfHjkE/ctekjEfCkT97nfekm6Rk/pN1rlJz6qjI6sgiZu3rKH4AIzslXQHHDz3kk3WdZ2g36vx5N9suQgFOcfTVD++r2dGQ== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) by VI1PR04MB10050.eurprd04.prod.outlook.com (2603:10a6:800:1db::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6954.19; Wed, 8 Nov 2023 14:12:17 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::7102:259:f268:5321]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::7102:259:f268:5321%6]) with mapi id 15.20.6977.011; Wed, 8 Nov 2023 14:12:17 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next 03/13] selftests: mptcp: do some cleanups Date: Wed, 8 Nov 2023 22:11:44 +0800 Message-Id: X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SG2PR03CA0108.apcprd03.prod.outlook.com (2603:1096:4:7c::36) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: HE1PR0402MB3497:EE_|VI1PR04MB10050:EE_ X-MS-Office365-Filtering-Correlation-Id: 500cc51d-cc14-4713-8522-08dbe064b6e5 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: RMx4JRXi0teNmQ+aq1+cryy6ZIG97nm0YeQiySNgsjqhn3UTn/fw0Ye/co2PQ5OSMaVHNzqccGi2wE427/MVO6HAnxfoBPS5DNKyJZk2qP94Y6fcqf79HDSNKY/9jyi0x6Ckmaox8TbXAQ4MgFFqk4xvb0M/ezTGdFuyfGNqPDG7lHFvRVTQm08/rYgTGWK7MxvbrJyqj+6G+bHeXDzrma8tklmkXhCB9L1Fa1FoDncz3VYt+3EWy+GGrXBNeCmlm074li79DDxxTK3bDWOUwZpDNF63voHqJhHZVK7XPQPPpFruNLdB1MIq14SmyHKP9a58cmLdLVaPEOvYrkTHpQfFt54rylBBqCwp90i8dnJUhCo6yqAbHVzpDNVqXITkSX+5oOcBo3Ad0QbdNVU89MM52GCyshBK2GRAAYh07rNFl+Ks/dmmSsqdf8j34vUHGkSAFCGm8pI+SNRi8fQX9FbTOqpV0Sg9hGBzpe6f3gvrnCGBV0H8AT/v2cHvsrdzN2i+ZDPTBrxibtW2GpDWEt2Y25B7Ke4Eb3Tcubs9Fj0taU5eyo12r7v9aXTC477o X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(136003)(39850400004)(346002)(366004)(396003)(376002)(230922051799003)(186009)(1800799009)(64100799003)(451199024)(26005)(478600001)(6512007)(107886003)(6666004)(6506007)(83380400001)(4326008)(44832011)(5660300002)(66476007)(66556008)(41300700001)(6916009)(8936002)(8676002)(6486002)(316002)(66946007)(2616005)(38100700002)(2906002)(36756003)(86362001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?NPzpXHfa2Q+2S6/R1+JTSLTLxDkepsMwSX6ehUFEDl+13MRz0dUI7A7DAYlR?= =?us-ascii?Q?dK3MHYtlwWNx5/Qh4X3l2X1cSJ6n0/9tSTh6upol4EhqsNX8NCWPVcyDFAZ7?= =?us-ascii?Q?jjI8SIv6ED7NkCZb/7eAW7FE3EbpqO+976Hq08IuFgcUyvzfW3J5XoVgJ6xI?= =?us-ascii?Q?qKf0k2yGUf+ADD6+RGFWv1FYBHs0bjHRUexreMbdyScjj8zXutWZQPN9G/Ea?= =?us-ascii?Q?gtD17xBk3T4W4z6f97R9GZnTYdBT1x6C67mQE9krGivhQRTeFoRNHJFLsOj5?= =?us-ascii?Q?Gs85xy0SA6WMFjXH4vt3m3j49GlWGqTSl0EeUkdUMdIfvips86A/QvETDEBY?= =?us-ascii?Q?5E78O73ED9clAmscUvIHSN+GxHDli9E7cUVZgG0CFU2UsGHK1Z955YsxY0XT?= =?us-ascii?Q?E8oNoWdXN+xaQ7Cx06S8s/COSyPphIn2mbROFzoIPn62bKOKz7u5Jy2O/Gws?= =?us-ascii?Q?HuTFLVwLnxBJm4lrOBfOqEDVH9G2kqGzleTd01RfUJP6QvlHAz4SkJ9gETHm?= =?us-ascii?Q?MlViM387guQybQ0WxCKODjwM4z2MFO2r1euC55E4zBSChCQ1YmNuVunu5IC+?= =?us-ascii?Q?8L/LVSObXIrvCI8UBNeinePXy2h+i/iaB6iNzrz9xPme3afvLSVWfgELjuY0?= =?us-ascii?Q?zpHAOWteclAGq2qCpHHgczY9FrnkBQWFOvk9ifFpfuot3DaGzUwPsWJjUKK+?= =?us-ascii?Q?MZic7Mpsc/jADtsnHQbaxYf6F8vjQ08wPLyHRSMPBla18sj80D8MjeHKMP9m?= =?us-ascii?Q?MUpIi5P2SKyU7YsYb5Y6xBo6aajzC8c82RGll9GyxsGY5CpcqG7DjGg0Mg69?= =?us-ascii?Q?HLxf9mJPDqzuBVwv19m/UXYgf3s8/aapwxyGWHMF92obeb8atXFvgoVgJ13k?= =?us-ascii?Q?5bLryL094OxT2j/UbaAgISx4z/nK2c3M4fm27zg60dlFqsIzEMY1687+8DO8?= =?us-ascii?Q?LzEUUvwwJVHfYlg6aoWSRkmjIzTa0s3kyMBhgbXNPH0AwG9tNz6hFy0cxvJ2?= =?us-ascii?Q?0ym5G+p2GDiNLOvzw/7KRwhG6/sAtmWp8fQnN3+SZlbLOSL5uqli5yDuc8A3?= =?us-ascii?Q?f9scgccGSvSTdTz520K5ElkXD/eYK+RSY4ZOom6popc0SGIFLAuLc3o8AFha?= =?us-ascii?Q?WFGyIu/G+53bUZwyehSeq4nW+TJ+3SCeggiKjEqD5KGJ1fSXWz0d2aUtr7vR?= =?us-ascii?Q?ewXvAjLhXgJrMy0QxYY9isD8gZfVAsfao1GWM2+HJzihPHzO97th9yCIvUua?= =?us-ascii?Q?MwknH7hPkmG4sgOFkhtTP2wsBTq53lsjLEl6JSc8rY9j9dJIE53s/reB0bnx?= =?us-ascii?Q?mt0anV6lp/xVkZrTa2Pa9hcoFCVZghqyuVRa42uSH/dsxcPLByZmCH8mq2aM?= =?us-ascii?Q?PZyEl+Zhv2/5r3I1OGouyZmW4ouhoWdudxnZt99rCfO69MMGFciPh9zG3cLO?= =?us-ascii?Q?Kh8VEJn3nUuvWVhPABh8jz0z6xWxxPRAE/ytUw4eSdSFC8Q+jDntcg86VSny?= =?us-ascii?Q?UxBySGurVipGq3/FIDUG9UYeof0ZE0vYseNJv0inqFeK507QHxSdsibY0MiM?= =?us-ascii?Q?7Sq2ELz7gSIvJNhRlBHnqLMMl5/3aQCci1pVKmlk?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 500cc51d-cc14-4713-8522-08dbe064b6e5 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Nov 2023 14:12:17.6136 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: deRcNBHwcHlijQunPz6Ncsfga76HnHiYu8L4ApmzKGznwChrNUsCTxEB+gyzKadEMs/K3n2MnVLkRopjSIndvg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB10050 Content-Type: text/plain; charset="utf-8" To maintain consistency with other scripts, this patch does some cleanups: drop duplicate 'ret' var in pm_netlink.sh, change 'capture' and 'checksum' as bool vars in mptcp_join, change timeout_poll to 30 in diag.sh. Signed-off-by: Geliang Tang --- tools/testing/selftests/net/mptcp/diag.sh | 2 +- .../testing/selftests/net/mptcp/mptcp_join.sh | 22 +++++++++---------- .../testing/selftests/net/mptcp/pm_netlink.sh | 1 - 3 files changed, 12 insertions(+), 13 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/diag.sh b/tools/testing/self= tests/net/mptcp/diag.sh index 95b498efacd1..e59d3b33bb22 100755 --- a/tools/testing/selftests/net/mptcp/diag.sh +++ b/tools/testing/selftests/net/mptcp/diag.sh @@ -8,7 +8,7 @@ rndh=3D$(printf %x $sec)-$(mktemp -u XXXXXX) ns=3D"ns1-$rndh" ksft_skip=3D4 test_cnt=3D1 -timeout_poll=3D100 +timeout_poll=3D30 timeout_test=3D$((timeout_poll * 2 + 1)) ret=3D0 =20 diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index 5c8873bc75e1..6d2e70785fdc 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -29,11 +29,11 @@ iptables=3D"iptables" ip6tables=3D"ip6tables" timeout_poll=3D30 timeout_test=3D$((timeout_poll * 2 + 1)) -capture=3D0 -checksum=3D0 +capture=3Dfalse +checksum=3Dfalse ip_mptcp=3D0 check_invert=3D0 -validate_checksum=3D0 +validate_checksum=3Dfalse init=3D0 last_test_failed=3D0 last_test_skipped=3D0 @@ -94,7 +94,7 @@ init_partial() ip netns exec $netns sysctl -q net.mptcp.pm_type=3D0 2>/dev/null || true ip netns exec $netns sysctl -q net.ipv4.conf.all.rp_filter=3D0 ip netns exec $netns sysctl -q net.ipv4.conf.default.rp_filter=3D0 - if [ $checksum -eq 1 ]; then + if $checksum; then ip netns exec $netns sysctl -q net.mptcp.checksum_enabled=3D1 fi done @@ -373,7 +373,7 @@ reset_with_checksum() ip netns exec $ns1 sysctl -q net.mptcp.checksum_enabled=3D$ns1_enable ip netns exec $ns2 sysctl -q net.mptcp.checksum_enabled=3D$ns2_enable =20 - validate_checksum=3D1 + validate_checksum=3Dtrue } =20 reset_with_allow_join_id0() @@ -406,7 +406,7 @@ reset_with_allow_join_id0() setup_fail_rules() { check_invert=3D1 - validate_checksum=3D1 + validate_checksum=3Dtrue local i=3D"$1" local ip=3D"${2:-4}" local tables @@ -978,7 +978,7 @@ do_transfer() :> "$sout" :> "$capout" =20 - if [ $capture -eq 1 ]; then + if $capture; then local capuser if [ -z $SUDO_USER ] ; then capuser=3D"" @@ -1079,7 +1079,7 @@ do_transfer() wait $spid local rets=3D$? =20 - if [ $capture -eq 1 ]; then + if $capture; then sleep 1 kill $cappid fi @@ -1467,7 +1467,7 @@ chk_join_nr() else print_ok fi - if [ $validate_checksum -eq 1 ]; then + if $validate_checksum; then chk_csum_nr $csum_ns1 $csum_ns2 chk_fail_nr $fail_nr $fail_nr chk_rst_nr $rst_nr $rst_nr @@ -3611,10 +3611,10 @@ while getopts "${all_tests_args}cCih" opt; do tests+=3D("${all_tests[${opt}]}") ;; c) - capture=3D1 + capture=3Dtrue ;; C) - checksum=3D1 + checksum=3Dtrue ;; i) ip_mptcp=3D1 diff --git a/tools/testing/selftests/net/mptcp/pm_netlink.sh b/tools/testin= g/selftests/net/mptcp/pm_netlink.sh index 8f4ff123a7eb..ed1e8380838a 100755 --- a/tools/testing/selftests/net/mptcp/pm_netlink.sh +++ b/tools/testing/selftests/net/mptcp/pm_netlink.sh @@ -28,7 +28,6 @@ sec=3D$(date +%s) rndh=3D$(printf %x $sec)-$(mktemp -u XXXXXX) ns1=3D"ns1-$rndh" err=3D$(mktemp) -ret=3D0 =20 cleanup() { --=20 2.35.3 From nobody Sat May 18 15:08:20 2024 Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on2044.outbound.protection.outlook.com [40.107.21.44]) (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 565F8199B1 for ; Wed, 8 Nov 2023 14:12:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=suse.com header.i=@suse.com header.b="kIx7Vqz1" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Z+bVN9/njl9UjjILv6goTNeddb41CYMqKgezZwFEfDFaJ42wy/JcaOmlRx2Dqm+d/VreqaRc/xbyzmLv7VttnTCYpAJgsNggzNuVwTLSGithWIPjcLO6GmPFIhzkXi4WQQSHRvWlc8tU9tajwWIEqMZOPfEwgFF5Iue6bfBQwtMB9WkpLuO521cMEORc9JB8t9XWyBpQDZwK3v7X0AzWCuXEIx012DjH8kBYrTLc+cciuOeCsOpvJTRNkQCMWtEzwMlNNG+2wi9ptHzVIa8ed51nQq5443Ye5OwKdbW9e1QCINUcv+SRC33oJayFZBpuzO72mkbt+YkgtIFdXklgjg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=mbxmweeRI4R9fx1A8Nf1RSKZVDnqMfYEbIWCS7aXAww=; b=PRHOIxGDar8npV2ei4sSLQ2CYuNGiwaXGUJ+14UUUeWEmDIBrRvWxSG1Lmx75fBpT5i3GNPuh7CLHSeBJpmlTO7kGqyGJ5jXZ+UQ//DCSZx8zazLw2vpyxoNfjmE6nZaiE/wtJYNpp11b2kNGP5RELesAgQBRGg/O0uB2VCTYPIskPac6TfbDb9yX4Em3e9k33N0LahLqO90FpGthQGvs8tNg6psGnjArC/7onFlH04AVZS/AGPwWkfDzRkX3zt86Qjeemaw5ZTFVigxpaG8w8t58rdHmiZX0olD+CvWB2KB90Ga840cRkMZPuYRUNutDCwjH0gGi4XNI65Fl10loQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=mbxmweeRI4R9fx1A8Nf1RSKZVDnqMfYEbIWCS7aXAww=; b=kIx7Vqz1PwsJ78kite8QR96/OTQ4Sjam/xxbLs8xYGXbsq8UU/jB0CLmV0fq16SU17SkvSThpXkdjEer2hNYwUrsaIzky3ttYmm+R1U9Lpqc02eVsadSFH6CBP/D0YY1vHwke0JNOJpAeYaVYOwihV5h1B1In64KWn4iWoCNarsUXUeisvmjhdfcouyt4Elyhgo2b8IIRQB1sGFgJZaJoDpfE7xvWO78D+6d7o5UyMUw9fDZmQJM1YU3hEW1OEYRE/Cqs6qFZOwDysXoKUn00S+afPoKxBozETfoWh43XicYJ8Tv+fsQ4RBMMpd0fnFTX0OIEsiR/7S9X+8E96VLtA== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) by VI1PR04MB10050.eurprd04.prod.outlook.com (2603:10a6:800:1db::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6954.19; Wed, 8 Nov 2023 14:12:23 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::7102:259:f268:5321]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::7102:259:f268:5321%6]) with mapi id 15.20.6977.011; Wed, 8 Nov 2023 14:12:23 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next 04/13] selftests: mptcp: renames some variables Date: Wed, 8 Nov 2023 22:11:45 +0800 Message-Id: <202275eded1999ccbccc3810d45388ceba17027d.1699452144.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SG2PR03CA0099.apcprd03.prod.outlook.com (2603:1096:4:7c::27) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: HE1PR0402MB3497:EE_|VI1PR04MB10050:EE_ X-MS-Office365-Filtering-Correlation-Id: 21a7ae89-d127-490e-6a78-08dbe064ba9a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: hcgc4YhbZ2mHux964yK5jUrR5yOj0MMGQiJTbLcUIVbrHoYSwqUnYgWr2maNztXKBviIxBg+k1nhXs7ZJBzl618FQwQD0qapMnb+4cMC22eoJt0WDNMJcdf0vBM2NOmnzddnlBCw2xcndFXj7WE1dTkliicsMjeLJlCHG1kddWFwAX28ng88HkX4g2d51y6wC68S6tJIKEgMiDn9SEsyPW4F0r+X1ysb9VaRw6+q/u6OWcjC4VrZ0Pyrfl3uP0YJxzdbl6E8CoCn+hsbbZ/636BQCB1T/XymHWB26d/p1Qp3jvDRih6A+O/b0eKMCQ3IhWRyyu+4nUoNQEFv0+ok73MlS6UuJru6WzTcGnBUUQ7O2Lnsj1Tu47ceUTADM/nTej35gs/XJ7yUhZbH7srvG2rSL2DxD1Tmr+pDMd2LUPXdoGNQuakJgH+8p/S4swCj73QJu2n50wLEOsSPzL+7epNCI50CULIw8TrBpwmRvfbqBHyLrrhzpWgHbZUB99mCSuyaPQCnYJDCM86tPca/tgwOk10oNpeSemTeRfnO7eBB8O0aiP79Fr+04soZ62Nl X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(136003)(39850400004)(346002)(366004)(396003)(376002)(230922051799003)(186009)(1800799009)(64100799003)(451199024)(26005)(478600001)(6512007)(107886003)(6666004)(6506007)(83380400001)(4326008)(44832011)(5660300002)(66476007)(66556008)(41300700001)(6916009)(8936002)(8676002)(6486002)(316002)(66946007)(2616005)(38100700002)(2906002)(36756003)(86362001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?cy6HR0GNzASx3gzihkNXeu32mNjML+BFXgDUzLp44YJacTXqdLNPmKft3dhc?= =?us-ascii?Q?B/215n3OHmoUat3DsXsn0LG7oOjqsdBNIRL8mNeiLMfOUgKrZE5+GbvguWHj?= =?us-ascii?Q?vbtmjFOyU/iBPyJIjiI2z2QzJjoTQO5tChcQGbk80bBJF2QIogb98LCV5TdI?= =?us-ascii?Q?XiGdyyJSUleyPa+QoBVwoCYGpJu2jMUpoaq0Mj5ocJxodVMgMpDXUKK17KQj?= =?us-ascii?Q?CO9FQIk/d/zLxuLK8mSXmc44yXmODGdgwnI5V1u9LtFI5NfxoGbgVxW5cq2F?= =?us-ascii?Q?reS4igBtVoDfRQiDPW7YldyvN3TXlflD4p90uT6AXvryZaMqf0RqXpPZpd2b?= =?us-ascii?Q?se0Sg4ClkEOP6rwe60X/H41E5+c4EayroYsKbdHCigZtMiSKTWktpm4VDs6/?= =?us-ascii?Q?5nPGamt4psShuRCMoS4FY0jCZSMznW7hpjzROpLFVWlfPs4Jn1j0hzC9PHU0?= =?us-ascii?Q?47xVRR5h4kMZS34QTRJP+kYjb7KocUqqhQpE0GR2NgdMzty8e+22X3eE/mJa?= =?us-ascii?Q?YnXSzExGB1XbMfIicEQ/0Q/TxxEkCfDLM2zzHGuYtJoARisxXTA0hOy9gbj/?= =?us-ascii?Q?/pND0EHVv8l9G8SCmuDawip1PB4ZgQvYRuR4xEjQm5Q45EMstZIZbTzcgG67?= =?us-ascii?Q?EpjhW/DNcVHtFGgO/+7g9E3VSODm9AneQP/H0EUCVJHZa62SstbHgparGqjf?= =?us-ascii?Q?uVrO1M+8OFPwOCUQAplMtXlUMY8F2MVGwlyBtUq1uD6QSojg5d0Wv1FofOmc?= =?us-ascii?Q?EVbh+dZLzsVHpVeK7RjIffH8QnfhAyhv8sFs8yN+lar1s9h2oh09YhATIskm?= =?us-ascii?Q?lmGAWI3wOc+QJKrk5rDDbFU/S8vyZ+6MKJaRATN2hopUd4Nlsg2N5Zke2dF6?= =?us-ascii?Q?P71N04h2nrkxkXik0uHt8ZWddml64GI0HrzknTkrgRKkxhYTiAvu1CRMlbUR?= =?us-ascii?Q?UTByJETVzZesbyQAgk/l1C3slbWFOcPNSVWfGij5gjRCwSfBWkr7/ZYJQ+07?= =?us-ascii?Q?wM53h1IF+IT8jwqScAMGMd8vD+iDDWIFqxRL0HErJEBqCyjbIDIfOwmmWLKC?= =?us-ascii?Q?Q7y/QCxpWt3qm+YQAhca/+72nlVaagyIUp8l5CZCzQUC3s7/Fd4tQkzM4UVE?= =?us-ascii?Q?Ma372xw1I1kgEiPrUddkDfAGy/h1d4HtrKmGcny9HVYrfiXxI8nN2fqL29t6?= =?us-ascii?Q?+Ut9qQPaO7YntOrtRw40Abbo194kn1Us+ujkvXz4KhcFHy5jyHO2fedIOrb9?= =?us-ascii?Q?2Ecu/jd7RJfP94tAkkvccRlOu7jdBPgUtDfRIqolhilTXP0KPIiytcSxUDWa?= =?us-ascii?Q?FXBWJVDE/jd/7sULv1uScrXI/V7dUcEIo14tj/EgZrYkXbyfoW4lgV6jiTGF?= =?us-ascii?Q?LZ1PTiCwb/RyXElSAWBLwFHt7UvUU3/7pdUI1dAwQgNSaebd4phpbBBoxc9r?= =?us-ascii?Q?EA3Z5qqGG5zIiB8ovwxNwNe3pLnWxool9N4u0OuUMG1FcwA7R+od8rKZQ0D9?= =?us-ascii?Q?Szhb9MFLtJ3Gyyy50ojrcKtm+gaISoAIgqARwckZkr6azYYph5ae+j2dQnpk?= =?us-ascii?Q?J6WsUpcu7jSkdwqp1LJIS8IzXEwMXOLolI1ruHwp?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 21a7ae89-d127-490e-6a78-08dbe064ba9a X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Nov 2023 14:12:23.7940 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: wl4z4wR9Y38Hak8Hqv6PUujhztk2iyEfYT/ArpPvIGi3YUDIvqL/n6vwxnoPGwyCOQws362VkIPh3i3YdyXUXA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB10050 Content-Type: text/plain; charset="utf-8" To maintain consistency with other scripts, this patch renames some variables: test_name -> TEST_NAME in userspace_pm.sh test_cnt -> TEST_COUNT in diag.sh, simult_flows.sh ns -> ns1 in diag.sh ns_sbox -> ns3 in mptcp_sockopt.sh Signed-off-by: Geliang Tang --- tools/testing/selftests/net/mptcp/diag.sh | 58 +++++++++---------- .../selftests/net/mptcp/mptcp_sockopt.sh | 12 ++-- .../selftests/net/mptcp/simult_flows.sh | 6 +- .../selftests/net/mptcp/userspace_pm.sh | 12 ++-- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/diag.sh b/tools/testing/self= tests/net/mptcp/diag.sh index e59d3b33bb22..043e199b0c62 100755 --- a/tools/testing/selftests/net/mptcp/diag.sh +++ b/tools/testing/selftests/net/mptcp/diag.sh @@ -5,9 +5,9 @@ =20 sec=3D$(date +%s) rndh=3D$(printf %x $sec)-$(mktemp -u XXXXXX) -ns=3D"ns1-$rndh" +ns1=3D"ns1-$rndh" ksft_skip=3D4 -test_cnt=3D1 +TEST_COUNT=3D1 timeout_poll=3D30 timeout_test=3D$((timeout_poll * 2 + 1)) ret=3D0 @@ -18,19 +18,19 @@ flush_pids() # give it some time sleep 1.1 =20 - ip netns pids "${ns}" | xargs --no-run-if-empty kill -SIGUSR1 &>/dev/null + ip netns pids "${ns1}" | xargs --no-run-if-empty kill -SIGUSR1 &>/dev/null =20 for _ in $(seq 10); do - [ -z "$(ip netns pids "${ns}")" ] && break + [ -z "$(ip netns pids "${ns1}")" ] && break sleep 0.1 done } =20 cleanup() { - ip netns pids "${ns}" | xargs --no-run-if-empty kill -SIGKILL &>/dev/null + ip netns pids "${ns1}" | xargs --no-run-if-empty kill -SIGKILL &>/dev/null =20 - ip netns del $ns + ip netns del $ns1 } =20 mptcp_lib_check_mptcp @@ -48,7 +48,7 @@ fi =20 get_msk_inuse() { - ip netns exec $ns cat /proc/net/protocols | awk '$1~/^MPTCP$/{print $3}' + ip netns exec $ns1 cat /proc/net/protocols | awk '$1~/^MPTCP$/{print $3}' } =20 __chk_nr() @@ -69,13 +69,13 @@ __chk_nr() else echo "[ fail ] expected $expected found $nr" mptcp_lib_result_fail "${msg}" - ret=3D$test_cnt + ret=3D$TEST_COUNT fi else echo "[ ok ]" mptcp_lib_result_pass "${msg}" fi - test_cnt=3D$((test_cnt+1)) + TEST_COUNT=3D$((TEST_COUNT+1)) } =20 __chk_msk_nr() @@ -83,7 +83,7 @@ __chk_msk_nr() local condition=3D$1 shift 1 =20 - __chk_nr "ss -inmHMN $ns | $condition" "$@" + __chk_nr "ss -inmHMN $ns1 | $condition" "$@" } =20 chk_msk_nr() @@ -104,7 +104,7 @@ wait_msk_nr() msg=3D$* =20 while [ $i -lt $timeout ]; do - nr=3D$(ss -inmHMN $ns | $condition) + nr=3D$(ss -inmHMN $ns1 | $condition) [ $nr =3D=3D $expected ] && break; [ $nr -gt $max ] && max=3D$nr i=3D$((i + 1)) @@ -115,16 +115,16 @@ wait_msk_nr() if [ $i -ge $timeout ]; then echo "[ fail ] timeout while expecting $expected max $max last $nr" mptcp_lib_result_fail "${msg} # timeout" - ret=3D$test_cnt + ret=3D$TEST_COUNT elif [ $nr !=3D $expected ]; then echo "[ fail ] expected $expected found $nr" mptcp_lib_result_fail "${msg} # unexpected result" - ret=3D$test_cnt + ret=3D$TEST_COUNT else echo "[ ok ]" mptcp_lib_result_pass "${msg}" fi - test_cnt=3D$((test_cnt+1)) + TEST_COUNT=3D$((TEST_COUNT+1)) } =20 chk_msk_fallback_nr() @@ -143,7 +143,7 @@ __chk_listen() local expected=3D$2 local msg=3D"$3" =20 - __chk_nr "ss -N $ns -Ml '$filter' | grep -c LISTEN" "$expected" "$msg" 0 + __chk_nr "ss -N $ns1 -Ml '$filter' | grep -c LISTEN" "$expected" "$msg" 0 } =20 chk_msk_listen() @@ -169,7 +169,7 @@ chk_msk_inuse() local msg=3D"$2" local listen_nr =20 - listen_nr=3D$(ss -N "${ns}" -Ml | grep -c LISTEN) + listen_nr=3D$(ss -N "${ns1}" -Ml | grep -c LISTEN) expected=3D$((expected + listen_nr)) =20 for _ in $(seq 10); do @@ -197,24 +197,24 @@ wait_connected() } =20 trap cleanup EXIT -ip netns add $ns -ip -n $ns link set dev lo up +ip netns add $ns1 +ip -n $ns1 link set dev lo up =20 echo "a" | \ timeout ${timeout_test} \ - ip netns exec $ns \ + ip netns exec $ns1 \ ./mptcp_connect -p 10000 -l -t ${timeout_poll} -w 20 \ 0.0.0.0 >/dev/null & -mptcp_lib_wait_local_port_listen $ns 10000 +mptcp_lib_wait_local_port_listen $ns1 10000 chk_msk_nr 0 "no msk on netns creation" chk_msk_listen 10000 =20 echo "b" | \ timeout ${timeout_test} \ - ip netns exec $ns \ + ip netns exec $ns1 \ ./mptcp_connect -p 10000 -r 0 -t ${timeout_poll} -w 20 \ 127.0.0.1 >/dev/null & -wait_connected $ns 10000 +wait_connected $ns1 10000 chk_msk_nr 2 "after MPC handshake " chk_msk_remote_key_nr 2 "....chk remote_key" chk_msk_fallback_nr 0 "....chk no fallback" @@ -225,16 +225,16 @@ chk_msk_inuse 0 "....chk 0 msk in use after flush" =20 echo "a" | \ timeout ${timeout_test} \ - ip netns exec $ns \ + ip netns exec $ns1 \ ./mptcp_connect -p 10001 -l -s TCP -t ${timeout_poll} -w 20 \ 0.0.0.0 >/dev/null & -mptcp_lib_wait_local_port_listen $ns 10001 +mptcp_lib_wait_local_port_listen $ns1 10001 echo "b" | \ timeout ${timeout_test} \ - ip netns exec $ns \ + ip netns exec $ns1 \ ./mptcp_connect -p 10001 -r 0 -t ${timeout_poll} -w 20 \ 127.0.0.1 >/dev/null & -wait_connected $ns 10001 +wait_connected $ns1 10001 chk_msk_fallback_nr 1 "check fallback" chk_msk_inuse 1 "....chk 1 msk in use" flush_pids @@ -245,16 +245,16 @@ NR_CLIENTS=3D100 for I in `seq 1 $NR_CLIENTS`; do echo "a" | \ timeout ${timeout_test} \ - ip netns exec $ns \ + ip netns exec $ns1 \ ./mptcp_connect -p $((I+10001)) -l -w 20 \ -t ${timeout_poll} 0.0.0.0 >/dev/null & done -mptcp_lib_wait_local_port_listen $ns $((NR_CLIENTS + 10001)) +mptcp_lib_wait_local_port_listen $ns1 $((NR_CLIENTS + 10001)) =20 for I in `seq 1 $NR_CLIENTS`; do echo "b" | \ timeout ${timeout_test} \ - ip netns exec $ns \ + ip netns exec $ns1 \ ./mptcp_connect -p $((I+10001)) -w 20 \ -t ${timeout_poll} 127.0.0.1 >/dev/null & done diff --git a/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh b/tools/tes= ting/selftests/net/mptcp/mptcp_sockopt.sh index c643872ddf47..3008f15c04f9 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh @@ -18,7 +18,7 @@ sec=3D$(date +%s) rndh=3D$(printf %x $sec)-$(mktemp -u XXXXXX) ns1=3D"ns1-$rndh" ns2=3D"ns2-$rndh" -ns_sbox=3D"ns_sbox-$rndh" +ns3=3D"ns3-$rndh" =20 add_mark_rules() { @@ -41,7 +41,7 @@ add_mark_rules() init() { local netns - for netns in "$ns1" "$ns2" "$ns_sbox";do + for netns in "$ns1" "$ns2" "$ns3";do ip netns add $netns || exit $ksft_skip ip -net $netns link set lo up ip netns exec $netns sysctl -q net.mptcp.enabled=3D1 @@ -80,7 +80,7 @@ init() cleanup() { local netns - for netns in "$ns1" "$ns2" "$ns_sbox"; do + for netns in "$ns1" "$ns2" "$ns3"; do ip netns del $netns done rm -f "$cin" "$cout" @@ -240,7 +240,7 @@ do_mptcp_sockopt_tests() return fi =20 - ip netns exec "$ns_sbox" ./mptcp_sockopt + ip netns exec "$ns3" ./mptcp_sockopt lret=3D$? =20 if [ $lret -ne 0 ]; then @@ -251,7 +251,7 @@ do_mptcp_sockopt_tests() fi mptcp_lib_result_pass "sockopt v4" =20 - ip netns exec "$ns_sbox" ./mptcp_sockopt -6 + ip netns exec "$ns3" ./mptcp_sockopt -6 lret=3D$? =20 if [ $lret -ne 0 ]; then @@ -282,7 +282,7 @@ run_tests() =20 do_tcpinq_test() { - ip netns exec "$ns_sbox" ./mptcp_inq "$@" + ip netns exec "$ns3" ./mptcp_inq "$@" local lret=3D$? if [ $lret -ne 0 ];then ret=3D$lret diff --git a/tools/testing/selftests/net/mptcp/simult_flows.sh b/tools/test= ing/selftests/net/mptcp/simult_flows.sh index ae8ad5d6fb9d..6fc0e08985d2 100755 --- a/tools/testing/selftests/net/mptcp/simult_flows.sh +++ b/tools/testing/selftests/net/mptcp/simult_flows.sh @@ -12,7 +12,7 @@ capture=3Dfalse ksft_skip=3D4 timeout_poll=3D30 timeout_test=3D$((timeout_poll * 2 + 1)) -test_cnt=3D1 +TEST_COUNT=3D1 ret=3D0 bail=3D0 slack=3D50 @@ -129,8 +129,8 @@ do_transfer() local sin=3D$2 local max_time=3D$3 local port - port=3D$((10000+$test_cnt)) - test_cnt=3D$((test_cnt+1)) + port=3D$((10000+$TEST_COUNT)) + TEST_COUNT=3D$((TEST_COUNT+1)) =20 :> "$cout" :> "$sout" diff --git a/tools/testing/selftests/net/mptcp/userspace_pm.sh b/tools/test= ing/selftests/net/mptcp/userspace_pm.sh index 5921589f0db9..601421ed4e49 100755 --- a/tools/testing/selftests/net/mptcp/userspace_pm.sh +++ b/tools/testing/selftests/net/mptcp/userspace_pm.sh @@ -49,7 +49,7 @@ rndh=3D$(printf %x "$sec")-$(mktemp -u XXXXXX) ns1=3D"ns1-$rndh" ns2=3D"ns2-$rndh" ret=3D0 -test_name=3D"" +TEST_NAME=3D"" =20 _printf() { stdbuf -o0 -e0 printf "${@}" @@ -63,9 +63,9 @@ print_title() # $1: test name print_test() { - test_name=3D"${1}" + TEST_NAME=3D"${1}" =20 - _printf "%-63s" "${test_name}" + _printf "%-63s" "${TEST_NAME}" } =20 print_results() @@ -76,13 +76,13 @@ print_results() test_pass() { print_results " OK " - mptcp_lib_result_pass "${test_name}" + mptcp_lib_result_pass "${TEST_NAME}" } =20 test_skip() { print_results "SKIP" - mptcp_lib_result_skip "${test_name}" + mptcp_lib_result_skip "${TEST_NAME}" } =20 # $1: msg @@ -95,7 +95,7 @@ test_fail() _printf "\t%s\n" "${1}" fi =20 - mptcp_lib_result_fail "${test_name}" + mptcp_lib_result_fail "${TEST_NAME}" } =20 # This function is used in the cleanup trap --=20 2.35.3 From nobody Sat May 18 15:08:20 2024 Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on2084.outbound.protection.outlook.com [40.107.21.84]) (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 F1CAF199BC for ; Wed, 8 Nov 2023 14:12:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=suse.com header.i=@suse.com header.b="nd7Cr8pt" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=P+Kt2Jz0OyWW+pHvFjukGu8jygadI5k3rDSXfUAil6xyKOn0nLJOsBAKkFjF7VOdqDUHPF4Us3WyhHLd6UbVqjZb4vm4CWxBgHNIytWjL5rv2kGk9AJHiik/ZsJ2bFj18ikTzJTPcffLNQ5J4elcKoTTOrAWxSuf5LaMggSYEIBl1xyszmXLvAVqZow02oV+o4RmIFsWfbOgBuJn7QEivOUawp94AUa7XKMjhPsZgqv4lfiF20Ujpn0vxw2XXSD6wLs42Bk06k6rWPySPhcWUHIAK8sTgxXCEqr7O6sFjp/gUcFGXysyb2qJx+ENAMoXPkvf5PkgjfkDnjj5t/12cw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=Fip0DlukTFJI3TIzfqqyr/9W2ee62LqBD7iRvG88oi8=; b=Oa3P06vu0AMLFT3vLtVbKTNKeiPGjLJ11WYxxF7YkXDqn+JhOCKXGGZC/OMjsPCLtkWkZYK4h4BsuKvHGH36dBiAsL4eLqicXywNCRvW4yfKMxo7sO6Usm8fTeyKJ7wqfps2CJZzqmCB/WeEHra1J0Q1qtOXt4SgE2Xo7EnpVTWgezivXwv43VnIVPvskypJQhna11FkML6eMraymHusK8Yj5Q/GEFSwsOISnv7j0e7xcqxBcg2VUEulU/ema72eBN95nDwWbwHqvcIcCD2znzHGMkAbWuTAuIW5UUpx1BIf6SqLwzykQK3uWuALbMjqCk88e3hYujP2aT7sJxu/2A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Fip0DlukTFJI3TIzfqqyr/9W2ee62LqBD7iRvG88oi8=; b=nd7Cr8ptRDAtsSN8X3yEtb9atSkfVMz4G6Y6CF/PvlN+Av/mRw7vuCHZPl4gg19HDYnJFJPuEExc7tHE+Fo6JFDKjTKY7VfFdVlp+TVkND+Wlx6gegk+tI1/1IPSTf8DY+O7AXuqLJu6LtiuNS1qZVEVw/y9bHQNaX14KpzA++44pbv92PwwimRTROfe2YxRl0pvTwqzXrtOKiGPNHiqANtfFM8CYPqCVSrGF98m9vl/a+YzNkD+CM/eRnXF6b1zzOdYoM6zvPIjBzk14GUECpF45H8tAZS+tAJun02iWbd0m1nTksMkeb+f/8rL1bL1lKCGToYOrrkSQ/nqusKiFw== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) by VI1PR04MB10050.eurprd04.prod.outlook.com (2603:10a6:800:1db::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6954.19; Wed, 8 Nov 2023 14:12:30 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::7102:259:f268:5321]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::7102:259:f268:5321%6]) with mapi id 15.20.6977.011; Wed, 8 Nov 2023 14:12:30 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next 05/13] selftests: mptcp: add mptcp_lib_echo_* helpers Date: Wed, 8 Nov 2023 22:11:46 +0800 Message-Id: <76626d6fe9f7c5c8f6ef412e4d0d96449b8d5421.1699452144.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SG2PR03CA0091.apcprd03.prod.outlook.com (2603:1096:4:7c::19) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: HE1PR0402MB3497:EE_|VI1PR04MB10050:EE_ X-MS-Office365-Filtering-Correlation-Id: 61be9123-93ff-4e48-8966-08dbe064be69 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: vn+9wMhFRk3pWwENtbUBvNQxGfNpA1BsNqF/TpLEjQ7TJtbcOeunYXe8scVh+MZtPlHAEqrLVGvmQN31OgMQ5KaMIUntMAGjRk8LhkzSPayqntTlqQsAZZH35+KgrWGK9d2azufdUYlGmH+hWYP2akCKudlm/MHJ8BuNizicAH3dBljZs+pk8fVEI0o0K9Ud5dCQNVXtC4S9Ie0oO5oeXIN5zOjCegEwvGCEr9H/YWK1kkHOW3HFxNy3coc1DbZ1ylwgw10LXvU8TaDRzUkx9t4l9KY15gakV9bn5vYw4DpWkG9+xiq0oBoD7/9tBsL2X9aQx9m6xTQWWV5N6WuRoyHF3LLYJ9EcdkdTWOVyWWek4laK5YnlvvvUUrGfn+MDf753fHi4KYyzn//SxS04Ve92iJu+/NEasinoUpmSSldIoNcqVR/UN7I1W3F+l54rTQaC4Qk9J2QkI5vr2eSiLUe5hlEnMaekqtNKDk91c4T84DW+5WIcCjt2f9dJxV0yxXF6naceGk9/xxgMDSGPVPUUkJ97DMBvDkAx9f7CfE6COKWMzHOxEIcqiUZARPHm X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(136003)(39850400004)(346002)(366004)(396003)(376002)(230922051799003)(186009)(1800799009)(64100799003)(451199024)(26005)(478600001)(6512007)(107886003)(6666004)(6506007)(83380400001)(4326008)(44832011)(5660300002)(66476007)(66556008)(41300700001)(6916009)(8936002)(8676002)(6486002)(316002)(66946007)(2616005)(38100700002)(2906002)(36756003)(86362001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?MtLUuE+8oyOs4j7DsczgrltYs8Ju6MnOPmJhhJbrtcXsCrNgj04WELMYyzoM?= =?us-ascii?Q?pMG30Y7Qa7R4tbfUEDtwSEIJJQi75emJywAHs9NN+xWfJBTFN/qRQZZRIZIW?= =?us-ascii?Q?/JVvmga7A15rla1j9FbQpKzVcw2fgb1YGeZ+xnjijZU5ucwXRdlgQn67yz3k?= =?us-ascii?Q?EyX2j3pcb99DI4O9uH66HZSenKWTcXBMnjja1O79AzlqHrtN8M8N/T7omi8r?= =?us-ascii?Q?85qlSuBAIarkGsGpYwVOjOxY54ffkgndHslZZMsbhPzEsTOFZflpv512My6k?= =?us-ascii?Q?omIL/6LtUSTg/uMEkykAs2zCjA5qe49YFPS3qtoSEftYYVy2NviciB3kZY7l?= =?us-ascii?Q?OZtyo09PM4aThwrQFI6iX5tvcfQEHhxvrNRa5ORrXPn6GjfU2d+Ilq2MZrId?= =?us-ascii?Q?f9rZ8TtBynttJRSUBkockOM2vX131ZOwYSDh1hYIGI8QAduylhOBfAG56s4C?= =?us-ascii?Q?3C9T/EZKC8SJhqdp8LjI3Qktzfjmr5xceaDApDql3Y4s17an0mZrbepYdbTL?= =?us-ascii?Q?KKUwrF3H71x+OKU1zUPqCM2z/a2AX4zAISHWMXYzssVGP4W13G4lXF1DrR9b?= =?us-ascii?Q?f4p0kQgqAEJXtg8lkG21NiufBnRUKKtMNdNk9ebxD50CjfF7OxYcOM6aAnmc?= =?us-ascii?Q?gTqGGfuXk26SZNn9flkXVRMsnRz6cSmYw0I9Ws/zApxtTDGGZQUq8C5EnFoC?= =?us-ascii?Q?s/RcOMDBpAiuRpON1oeXbPB8kE1LRajZ6woUuqoODxL7sYx2VV/U5L8+ttoJ?= =?us-ascii?Q?Xe8g/gWs/eJmRNb2fdWDmwXLAoFtE+TgfdUwIHDHxNYjxvqEFHD6vtbhDIN9?= =?us-ascii?Q?PuEavdmWKHhJGMiHNBR/BaDuWhF0ElrKM8Tnw/l0ISeoCVxHebjgG13AZEao?= =?us-ascii?Q?qLtceEPYZ49rbuBZxUgrn/X0U+vkDQoX8F1uP/KLrr4qm9H85s+4wIL7Al6C?= =?us-ascii?Q?iua/o6kcEI8GFMRhLvd3NWcuiPzsXvsiEMv/nvvB4Lfv1u/p7Jd+Q6GNJNhu?= =?us-ascii?Q?7/A4KPjxPrS4uvkxedov2ynFUUL2fN2J/3PWon2Ko0+UkGlFGiveNlEC7CsH?= =?us-ascii?Q?uJIVwTc3cyI6mRZDMULTmLkh/CJdVOKfjmYh8D8Wc8RVc8w/atSkhIE5KRIG?= =?us-ascii?Q?RtfKp0JSCYOv1Lvwo9xWCflUXKFFN4vxdnQCJJhgxejy7K9HdC5UQ4ZYKY5+?= =?us-ascii?Q?VRTd5nCMXMWS9RE+ZDLR+hZjVqPikJdm5xGd/weWzeR08bxx+a81Uwqo4iIp?= =?us-ascii?Q?TgZwkZdGKNMz7ZWI1ni3hDElxrdkDr4MseBxUMFLZwBdWoI+jN+7VE/6fVIz?= =?us-ascii?Q?uC1vOyvbD3DuZ4xHrarMvpxtrOzq9tMiakXqHVxJc9lBW1u8XPFVosuF/rbo?= =?us-ascii?Q?+kQfixSIkmAOkPrP1v4oUVE5RsSVJth3I3C7s1ZEzZEWHkjEH2i/+n0fbUVu?= =?us-ascii?Q?SzKAGzJ/IAyfJfGvFTh8fipAaVu+rPPaQOai3CzJq++kdLeXEtvHfMOwPZsh?= =?us-ascii?Q?4+ZtQN4ooMkUWiyWndzWNedWJoXs4xTLE5XYbPTanIB0VS1LUq3XuIpXo2OI?= =?us-ascii?Q?1gHNYfiN+Has7D5Wn0soAfJFPYvjWXkXNA9KyOl8?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 61be9123-93ff-4e48-8966-08dbe064be69 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Nov 2023 14:12:29.9865 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 0IOJ5jde2BEPRcYe60DxCMYQ3C1QP4NuOVs3SZvQ/0zdsQHoh+GjPXbFEzIqqYSoEznasnRcmqKV+2VvkTIItw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB10050 Content-Type: text/plain; charset="utf-8" The helpers mptcp_lib_print_* print the text with a newline, but sometimes this EOL dosen't needed. So this patch adds another set of helpers mptcp_lib_echo_*, do not output the trailing newline. Signed-off-by: Geliang Tang --- .../testing/selftests/net/mptcp/mptcp_lib.sh | 30 +++++++++++++++---- 1 file changed, 24 insertions(+), 6 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_lib.sh b/tools/testing= /selftests/net/mptcp/mptcp_lib.sh index ffd78187237b..7a68791c5773 100644 --- a/tools/testing/selftests/net/mptcp/mptcp_lib.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_lib.sh @@ -33,25 +33,43 @@ else readonly MPTCP_LIB_COLOR_RESET=3D fi =20 +# mptcp_lib_echo_*: do not output the trailing newline # $1: color, $2: text -mptcp_lib_print_color() { - echo -e "${MPTCP_LIB_START_PRINT:-}${*}${MPTCP_LIB_COLOR_RESET}" +mptcp_lib_echo_color() { + echo -n -e "${MPTCP_LIB_START_PRINT:-}${*}${MPTCP_LIB_COLOR_RESET}" } =20 +mptcp_lib_echo_ok() { + mptcp_lib_echo_color "${MPTCP_LIB_COLOR_GREEN}${*}" +} + +mptcp_lib_echo_warn() { + mptcp_lib_echo_color "${MPTCP_LIB_COLOR_YELLOW}${*}" +} + +mptcp_lib_echo_info() { + mptcp_lib_echo_color "${MPTCP_LIB_COLOR_BLUE}${*}" +} + +mptcp_lib_echo_err() { + mptcp_lib_echo_color "${MPTCP_LIB_COLOR_RED}${*}" +} + +# mptcp_lib_print_*: output with EOL mptcp_lib_print_ok() { - mptcp_lib_print_color "${MPTCP_LIB_COLOR_GREEN}${*}" + mptcp_lib_echo_ok "${*}\n" } =20 mptcp_lib_print_warn() { - mptcp_lib_print_color "${MPTCP_LIB_COLOR_YELLOW}${*}" + mptcp_lib_echo_warn "${*}\n" } =20 mptcp_lib_print_info() { - mptcp_lib_print_color "${MPTCP_LIB_COLOR_BLUE}${*}" + mptcp_lib_echo_info "${*}\n" } =20 mptcp_lib_print_err() { - mptcp_lib_print_color "${MPTCP_LIB_COLOR_RED}${*}" + mptcp_lib_echo_err "${*}\n" } =20 # SELFTESTS_MPTCP_LIB_EXPECT_ALL_FEATURES env var can be set when validati= ng all --=20 2.35.3 From nobody Sat May 18 15:08:20 2024 Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on2056.outbound.protection.outlook.com [40.107.21.56]) (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 07D6C171CF for ; Wed, 8 Nov 2023 14:12:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=suse.com header.i=@suse.com header.b="Q6NG/3rg" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=iarYc2wKkbSs0PQILHzZvA5lEL+4wpbkdklYRiXtrIBmqbVSZrNWAav6pOh7v0wjJbT3ZbEzj2W4YLB3cJ7+gzMN90TRxNTo2qeXDQyTZxW7csRaloQVq6HLuKa8s7T6kvGE5bjybe0DFP9iAuRumUc5qpXBn6yZR0j16BBX2+sx/vs5JlFy7P4AEEjvIOLYp0LROLnlIU60xVmtonHNDUXpbh2zAwgWzAXvZe+tojOI+8K7sazhfCqVurmPD2WbBHgKOpCKNNgyuWc9wKoFGXHGKzyvZtPy5UIu3yblo9u6a5gu9BwqPp94/3U0zT4mg+nHuebqrWwryJnfFagyCQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=OzMJUJf6z+DqoO+0WgBNdb8FFNJAztpQNjv0sWYAHoM=; b=CkIZgM019/Zedg5PV8cncK4GB2GHTmLU8te530Wv6IAIYUaynGECDNHF6wRVSYNC8q6A3Rf/vmB3KF77uX62nq/UEgt9UNDxefMQX7CkmVwCorU+oVMUpG6B/4RKSCaxBk26T9Ck6XicMOBgKxGZF9dSTd/WL+p9TqQUE5D6RY5ag3BTU/VKCJT17y+N0p6Nzdd1Clqqt6BMdwVQ9JQFkF4GEiMTByd8QSlENMs7B3VzLsg2QgPTXci7QrEbSORm/+U73dsKkFI4fzWBpPzoskV1HwYDDviMjYIlEvf671RLLD+C5XVts2bOlBtreV7nDTf1uKhBItjJ3uADpN8/fQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=OzMJUJf6z+DqoO+0WgBNdb8FFNJAztpQNjv0sWYAHoM=; b=Q6NG/3rgXHUmTiKTvyBqDXLbRrqAZVpXAldVm8pGWcWNIqBEtQSTZli1OvTARAZtz9ss+8IPtA1oGMtCnDmJwTKmUXUNHlUvKVhvqlQeOmidOjzfJ/fAO0qbJY69SiZGnkRk5Myo+9Ua4QB2+prqLGl+6dbeG90OxXVWL0fbt6Uly/3KLJNFl/HG1bIkhiHqLBKyQpCXrzKiDjXHq5U07EGeFNs55cPJqXo7fWSQ2IUbpZthhWmb0VKpd0dULcDbYrUlbAqIevJsHnUgnWDj8P/Be7wJluCV0PtiQua5Uns2UQbd/zhm1rjz5daTINDsX8LP+OBqfYsy5M38wQLMJQ== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) by VI1PR04MB10050.eurprd04.prod.outlook.com (2603:10a6:800:1db::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6954.19; Wed, 8 Nov 2023 14:12:36 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::7102:259:f268:5321]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::7102:259:f268:5321%6]) with mapi id 15.20.6977.011; Wed, 8 Nov 2023 14:12:36 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang , Matthieu Baerts Subject: [PATCH mptcp-next 06/13] selftests: mptcp: print colored outputs Date: Wed, 8 Nov 2023 22:11:47 +0800 Message-Id: <02fd40689f31f73ee53705ba2e747242882f820b.1699452144.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SG2PR02CA0037.apcprd02.prod.outlook.com (2603:1096:3:18::25) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: HE1PR0402MB3497:EE_|VI1PR04MB10050:EE_ X-MS-Office365-Filtering-Correlation-Id: 486240b7-f219-4dca-4a80-08dbe064c1d9 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: SEiWBa5DhSRyg1pjWHRR62Ag4aD9+Ekskkom9giaI+7vU+PToFdsrcEvjDQqpMLqlVHvh8oVi7SWpNzncMG9o1XE9PwKvcUz/XjDgwUWsM4W6engX4v5Lx7c4l8waWSkYCEVoOsO0hAPb7cToGlDHKLQizCYN2wuFFfFQxUtYsATKiL/hakFjobLQvCY6+pYYy4DiCHYBsFPMJUNmf4L5dEX7voGZnzpiWMVMcfWdXrWDaCHXm//m0Et5l530ANmttEaOgGJ9TSPo0hDWkmIqd6lanW9apOw6WA4yqIUJPNUG0ABLKML7otLp+X1cU8IebDMVI48nU9NdulYU+HYHG1VQwA4LfLU0P0tPk1CkZVYJfdozx9nXeOOCc3bZU9VQzWHpsjxAOa/MakaKoY8cmPJXbLW7oJfdLMpL+h4ttYxOADFkoBcepK98bueXva8arZyT0qXDlSffGo2wePxNPwVFQdL66hLNAZd5JQ0x3pePSZoFYwoPMSZ0JjYR0dYURko+T8Tduw5XIS5KTxYDyG2A0ejQvZWYNEUrxA4MZm0Ibjnu4wPWZbOWo1HOsTS X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(136003)(39850400004)(346002)(366004)(396003)(376002)(230922051799003)(186009)(1800799009)(64100799003)(451199024)(26005)(478600001)(6512007)(6666004)(54906003)(6506007)(83380400001)(4326008)(44832011)(5660300002)(66476007)(66556008)(41300700001)(6916009)(8936002)(8676002)(6486002)(316002)(66946007)(2616005)(38100700002)(2906002)(36756003)(86362001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?MRG3C8jNHmOC7m/h0l3AeS+7x2xiuN3C3tw1Fozxs7XAWnUUk9AEJzff6YL8?= =?us-ascii?Q?TqEO1lFQploowibW34VOsNPCL58cJEMCmkPTkp98AOObuMTNHYr1nCAZhf7i?= =?us-ascii?Q?0JrdENaeYj1lJabW7D/G9qUfZV0W7giix5fjWkbDKGuxVeMQt9+5gLaksllB?= =?us-ascii?Q?DK+W/xBQJJHpzGRWKFRagIVjB3BNDLotI/AUnYALK/60Av7Q9r21X2MAmRfA?= =?us-ascii?Q?qGy/XWN2caWHxI7o9hse/ktgdDH0AK/Z8envbpRQvFwG5pxJeeinLMHwDTbT?= =?us-ascii?Q?XcNKMgmb2Fp2CH71mD14hNjgW3oIDfAstSaYFZazFKgVfK5r9S0VQIjU+cvL?= =?us-ascii?Q?SWMzNS2BbaZIIRg3obOf4H6dEwlHZjgxC2Dr18NwUfKHjW88qXOBZi/66QhZ?= =?us-ascii?Q?/ywFtshZi9VR9c1gs+Hyi1DrBstLeYT43YrQWT63OKLOzjpjyxOTWFK5Kb81?= =?us-ascii?Q?Gb4GucnGmw1w/UEtE7d+sVhGAYZwN93iNYCBqinZBShDRzBhysDv+6BrrfoO?= =?us-ascii?Q?bYpro6ldWhoCFRLu4aosFRnrMLTkwpwrumBjVVrM2Sz96cmVAcnTQeyzZyVO?= =?us-ascii?Q?a6YXueGkzKdzcY+7miBXaare221gJV0RJ+qd5r2oLknFiCtjwLoW/nH+wMSj?= =?us-ascii?Q?BeE8MdH3UwBkNA59YKichZnMTHrhgNgRsLN2NMIvBIc0L62saYYtU5uUMXo5?= =?us-ascii?Q?AE2z8jRCvSfBEVU7PcKMDjOWbUOKxPXFvUIn5NnpCVQK0Y9/OjfHVf3kDTx1?= =?us-ascii?Q?ySOjHRTct+2dExZkXnVJkqzA6V/jLft+4RZBUB4Cz+eBZTFkGnddnQBQRpnR?= =?us-ascii?Q?UjPgzFkjQgu5oAvb3H11JKNhYQMFbKga8M/rdoyeJxdWYpi8RyXWY0PLlqkL?= =?us-ascii?Q?hI/BS8Ih0bSECm87a5dVSGXL6dP1F0b8ooBorDaS+XP0DJUBYQsY6pl1kFze?= =?us-ascii?Q?SP4mAdvkhFXDzpvenTJ5stfnJFHun0nYsm5hNTBh6Kx/ziSYXs/NMayHe1pz?= =?us-ascii?Q?zYlEHSRb1CX4QZs4+TyK2Icl6fKbde91g6avboIp/7yu6l4ASz6kFB9S+7C9?= =?us-ascii?Q?ZUX+rLtveXhRTwTxnWyvkN6sGViAOeqP06N5GYCr1wOzhD5JRsysZDGj7qSq?= =?us-ascii?Q?g0JwAtpQPkQ1BGkfS3FifSYCTOjjnyN/6rpXRa9B84kU8G9d84VHKQ+cBRYv?= =?us-ascii?Q?1LdRP0rlN9AlWg1p7DwqhzK/85Q7i/Krq+Q/UQo/jRgIJ4HVNW9XQ1eC/IQh?= =?us-ascii?Q?YTvu4PgsWzZ6r2YxeU99gNt/IdTGRY3/dYNB/ELh9u50Pu5MIPKn89LDryPH?= =?us-ascii?Q?qrnMB+eZvJenpafL+ZON5RWk43Dea41WiE7put3WgYgmFExlFyXaVpZWANmV?= =?us-ascii?Q?Gxdp+rQOF26o0DPb8UgM8MM6D7f9uKkebVGAfFtuYINjCNbftkgS59ShD+hr?= =?us-ascii?Q?/QjAl1gVdvBUaOUhxay3iySCKRDxAv+pzwJuQv453+waLD0s+IfAhv2wi1U+?= =?us-ascii?Q?aIxxm3OaLIFEkSlZ3wHHGArACPWKy7CXRJW4fX9OMcNuqsA3siUeZMQZilaV?= =?us-ascii?Q?X08fdwnToeNc9zz9ybsb/nw6quJYxxsS7cHYcVMR?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 486240b7-f219-4dca-4a80-08dbe064c1d9 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Nov 2023 14:12:36.0007 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: H4x5WNnquT1vQAn27iEmERAJItergM6M/6hYsjscg+OjNm/tutWhBoYFbuoD9upBT7Dp5vBdWX/yV2F1PvXIrQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB10050 Content-Type: text/plain; charset="utf-8" Use mptcp_lib_print_info(), _ok(), _warn(), and _err() helpers and mptcp_lib_echo_* helper in the scripts diag.sh, mptcp_connect.sh, mptcp_sockopt.sh, pm_netlink.sh, simult_flows.sh and userspace_pm.sh to print test results with colors. Having colors helps to quickly identify issues when looking at a long list of output logs and results. Reviewed-by: Matthieu Baerts Signed-off-by: Geliang Tang --- tools/testing/selftests/net/mptcp/diag.sh | 12 ++++++------ .../selftests/net/mptcp/mptcp_connect.sh | 17 +++++++++-------- .../selftests/net/mptcp/mptcp_sockopt.sh | 6 +++--- tools/testing/selftests/net/mptcp/pm_netlink.sh | 6 +++--- .../testing/selftests/net/mptcp/simult_flows.sh | 4 ++-- .../testing/selftests/net/mptcp/userspace_pm.sh | 13 ++++--------- 6 files changed, 27 insertions(+), 31 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/diag.sh b/tools/testing/self= tests/net/mptcp/diag.sh index 043e199b0c62..0e8fbb55db8f 100755 --- a/tools/testing/selftests/net/mptcp/diag.sh +++ b/tools/testing/selftests/net/mptcp/diag.sh @@ -64,15 +64,15 @@ __chk_nr() printf "%-50s" "$msg" if [ $nr !=3D $expected ]; then if [ $nr =3D "$skip" ] && ! mptcp_lib_expect_all_features; then - echo "[ skip ] Feature probably not supported" + mptcp_lib_print_warn "[ skip ] Feature probably not supported" mptcp_lib_result_skip "${msg}" else - echo "[ fail ] expected $expected found $nr" + mptcp_lib_print_err "[ fail ] expected $expected found $nr" mptcp_lib_result_fail "${msg}" ret=3D$TEST_COUNT fi else - echo "[ ok ]" + mptcp_lib_print_ok "[ ok ]" mptcp_lib_result_pass "${msg}" fi TEST_COUNT=3D$((TEST_COUNT+1)) @@ -113,15 +113,15 @@ wait_msk_nr() =20 printf "%-50s" "$msg" if [ $i -ge $timeout ]; then - echo "[ fail ] timeout while expecting $expected max $max last $nr" + mptcp_lib_print_err "[ fail ] timeout while expecting $expected max $max= last $nr" mptcp_lib_result_fail "${msg} # timeout" ret=3D$TEST_COUNT elif [ $nr !=3D $expected ]; then - echo "[ fail ] expected $expected found $nr" + mptcp_lib_print_err "[ fail ] expected $expected found $nr" mptcp_lib_result_fail "${msg} # unexpected result" ret=3D$TEST_COUNT else - echo "[ ok ]" + mptcp_lib_print_ok "[ ok ]" mptcp_lib_result_pass "${msg}" fi TEST_COUNT=3D$((TEST_COUNT+1)) diff --git a/tools/testing/selftests/net/mptcp/mptcp_connect.sh b/tools/tes= ting/selftests/net/mptcp/mptcp_connect.sh index 7898d62fce0b..b28d7d3ce4de 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_connect.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_connect.sh @@ -280,7 +280,8 @@ check_mptcp_disabled() return 1 fi =20 - echo -e "New MPTCP socket can be blocked via sysctl\t\t[ OK ]" + echo -n -e "New MPTCP socket can be blocked via sysctl\t\t" + mptcp_lib_print_ok "\t [ OK ]" mptcp_lib_result_pass "New MPTCP socket can be blocked via sysctl" return 0 } @@ -496,7 +497,7 @@ do_transfer() fi =20 if [ $retc -eq 0 ] && [ $rets -eq 0 ]; then - printf "[ OK ]" + mptcp_lib_echo_ok "[ OK ]" mptcp_lib_result_pass "${TEST_GROUP}: ${result_msg}" else mptcp_lib_result_fail "${TEST_GROUP}: ${result_msg}" @@ -703,7 +704,7 @@ EOF return fi =20 - echo "INFO: test $msg" + mptcp_lib_print_info "INFO: test $msg" =20 TEST_COUNT=3D10000 local extra_args=3D"-o TRANSPARENT" @@ -730,7 +731,7 @@ run_tests_peekmode() local peekmode=3D"$1" =20 TEST_GROUP=3D"peek mode: ${peekmode}" - echo "INFO: with peek mode: ${peekmode}" + mptcp_lib_print_info "INFO: with peek mode: ${peekmode}" run_tests_lo "$ns1" "$ns1" 10.0.1.1 1 "-P ${peekmode}" run_tests_lo "$ns1" "$ns1" dead:beef:1::1 1 "-P ${peekmode}" } @@ -745,7 +746,7 @@ run_tests_mptfo() return fi =20 - echo "INFO: with MPTFO start" + mptcp_lib_print_info "INFO: with MPTFO start" ip netns exec "$ns1" sysctl -q net.ipv4.tcp_fastopen=3D2 ip netns exec "$ns2" sysctl -q net.ipv4.tcp_fastopen=3D1 =20 @@ -757,7 +758,7 @@ run_tests_mptfo() =20 ip netns exec "$ns1" sysctl -q net.ipv4.tcp_fastopen=3D0 ip netns exec "$ns2" sysctl -q net.ipv4.tcp_fastopen=3D0 - echo "INFO: with MPTFO end" + mptcp_lib_print_info "INFO: with MPTFO end" } =20 run_tests_disconnect() @@ -781,7 +782,7 @@ run_tests_disconnect() cin_disconnect=3D"$old_cin" connect_per_transfer=3D3 =20 - echo "INFO: disconnect" + mptcp_lib_print_info "INFO: disconnect" run_tests_lo "$ns1" "$ns1" 10.0.1.1 1 "-I 3 -i $old_cin" run_tests_lo "$ns1" "$ns1" dead:beef:1::1 1 "-I 3 -i $old_cin" =20 @@ -830,7 +831,7 @@ check_mptcp_disabled =20 stop_if_error "The kernel configuration is not valid for MPTCP" =20 -echo "INFO: validating network environment with pings" +mptcp_lib_print_info "INFO: validating network environment with pings" for sender in "$ns1" "$ns2" "$ns3" "$ns4";do do_ping "$ns1" $sender 10.0.1.1 do_ping "$ns1" $sender dead:beef:1::1 diff --git a/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh b/tools/tes= ting/selftests/net/mptcp/mptcp_sockopt.sh index 3008f15c04f9..44095b274c40 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh @@ -291,7 +291,7 @@ do_tcpinq_test() return $lret fi =20 - echo "PASS: TCP_INQ cmsg/ioctl $@" + mptcp_lib_print_info "PASS: TCP_INQ cmsg/ioctl $@" mptcp_lib_result_pass "TCP_INQ: $*" return $lret } @@ -338,12 +338,12 @@ run_tests $ns1 $ns2 10.0.1.1 run_tests $ns1 $ns2 dead:beef:1::1 =20 if [ $ret -eq 0 ];then - echo "PASS: all packets had packet mark set" + mptcp_lib_print_info "PASS: all packets had packet mark set" fi =20 do_mptcp_sockopt_tests if [ $ret -eq 0 ];then - echo "PASS: SOL_MPTCP getsockopt has expected information" + mptcp_lib_print_info "PASS: SOL_MPTCP getsockopt has expected information" fi =20 do_tcpinq_tests diff --git a/tools/testing/selftests/net/mptcp/pm_netlink.sh b/tools/testin= g/selftests/net/mptcp/pm_netlink.sh index ed1e8380838a..3b0512ff5d54 100755 --- a/tools/testing/selftests/net/mptcp/pm_netlink.sh +++ b/tools/testing/selftests/net/mptcp/pm_netlink.sh @@ -59,15 +59,15 @@ check() =20 printf "%-50s" "$msg" if [ $cmd_ret -ne 0 ]; then - echo "[FAIL] command execution '$cmd' stderr " + mptcp_lib_print_err "[FAIL] command execution '$cmd' stderr " cat $err mptcp_lib_result_fail "${msg} # error ${cmd_ret}" ret=3D1 elif [ "$out" =3D "$expected" ]; then - echo "[ OK ]" + mptcp_lib_print_ok "[ OK ]" mptcp_lib_result_pass "${msg}" else - echo -n "[FAIL] " + mptcp_lib_echo_err "[FAIL] " echo "expected '$expected' got '$out'" mptcp_lib_result_fail "${msg} # different output" ret=3D1 diff --git a/tools/testing/selftests/net/mptcp/simult_flows.sh b/tools/test= ing/selftests/net/mptcp/simult_flows.sh index 6fc0e08985d2..2ab0e649031a 100755 --- a/tools/testing/selftests/net/mptcp/simult_flows.sh +++ b/tools/testing/selftests/net/mptcp/simult_flows.sh @@ -189,12 +189,12 @@ do_transfer() printf "%-16s" " max $max_time " if [ $retc -eq 0 ] && [ $rets -eq 0 ] && \ [ $cmpc -eq 0 ] && [ $cmps -eq 0 ]; then - echo "[ OK ]" + mptcp_lib_print_ok "[ OK ]" cat "$capout" return 0 fi =20 - echo " [ fail ]" + mptcp_lib_print_err " [ fail ]" echo "client exit code $retc, server $rets" 1>&2 echo -e "\nnetns ${ns3} socket stat for $port:" 1>&2 ip netns exec ${ns3} ss -nita 1>&2 -o "sport =3D :$port" diff --git a/tools/testing/selftests/net/mptcp/userspace_pm.sh b/tools/test= ing/selftests/net/mptcp/userspace_pm.sh index 601421ed4e49..613fdb289881 100755 --- a/tools/testing/selftests/net/mptcp/userspace_pm.sh +++ b/tools/testing/selftests/net/mptcp/userspace_pm.sh @@ -57,7 +57,7 @@ _printf() { =20 print_title() { - _printf "INFO: %s\n" "${1}" + mptcp_lib_print_info "INFO: ${1}" } =20 # $1: test name @@ -68,27 +68,22 @@ print_test() _printf "%-63s" "${TEST_NAME}" } =20 -print_results() -{ - _printf "[%s]\n" "${1}" -} - test_pass() { - print_results " OK " + mptcp_lib_print_ok "[ ok ]${1:+ ${*}}" mptcp_lib_result_pass "${TEST_NAME}" } =20 test_skip() { - print_results "SKIP" + mptcp_lib_print_warn "[skip]${1:+ ${*}}" mptcp_lib_result_skip "${TEST_NAME}" } =20 # $1: msg test_fail() { - print_results "FAIL" + mptcp_lib_print_err "[fail]${1:+ ${*}}" ret=3D1 =20 if [ -n "${1}" ]; then --=20 2.35.3 From nobody Sat May 18 15:08:20 2024 Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on2066.outbound.protection.outlook.com [40.107.21.66]) (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 6AD7E171CF for ; Wed, 8 Nov 2023 14:12:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=suse.com header.i=@suse.com header.b="pQ2GX0c5" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=RZ863/Oi70uPyQgVRnhs/q3wxsF4Q//SByA7v9ZRMf2NNbNYa9EXxwm18z6MOg4rxLPx4o5bakCJlazwUgOeD37iBa1hf9QRvFNBOCr4kMC+/UKXECJ9HrntMnJomEpWywaQdo46XfbYdCxHbxYlYnMjVSbDhZy/oq8wZoP9zINCEoN/FPUD/kmuL7RJSizv4xbHTOVOTbqi3HeyOuoPDf3iAgOIo2kayj2NoenQyuHoYH/fTXXXlEmqKzI7nujpUCw60Ip0qpN5Z0ccKoSrJSKEemeNxeLUjrO8i+w44ph/IKgtietyQToBMpJk3InIDruF87axyk7Xo3mu03u2eA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=D66Yaxt4JsKLJ0oIoo2vbW1KmkzohR8wATAcYq02qgo=; b=mPf/fDKaRdviL5EQCkQxyyWasRF2s5yjcJmzUSnvWR8o6RIrD9zCIef1wZ82UqMalOs7a4HBbZhijETa6X4vbfbIUrbi8udgJzKuqPLKfAMuFttz/vFLZ/6k7ad1fgkZQ3eNc1IIZhIWbVGKTAl1cXTPmTDNNxrVlqi9uwO0qxDbKs620LZ1QRlx2DCtWfOgJDJS10a+ivcUQfjCxyBQZ+X0FWC1sRFwYafoV8/Muzej/7vLkGuTnZo7febnvaxqVcNAXgUUaFH99aC8XCUUY5EnmnnzwlGxpHmliwIapFNtdMtyqpgb4ThmGiBXi0pSFfsk/QP1VP3syvtz4oicYw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=D66Yaxt4JsKLJ0oIoo2vbW1KmkzohR8wATAcYq02qgo=; b=pQ2GX0c5FbsTMArQuPkP4UT7om8dXmuKlEihgKLo7ONPnEZZ/YE+nZpHQokZ0CnSUshPVjL1SO0ASmoII6ftdxBr63GlWBUP3c0e4XraqW0uBkajwTIDkfreHQ60IKeaUYPa65n0YB26L3mejijDMB17hg/SVIlZU4QnbPnlMl8ZA2/PfUuBP2irWtE8dZPHtU6IPCD0W0NjcONy2w0J62GB1olJnMtxPNwgsGmUL4hknwVFA+3l1vxsdKa8bfo2gumkYxW4xwE2S0/as7aWI+w7+YZOwB7ktgRlmiZkWJ1ONLUUktHw96bZ+1oSFDusgecaMmOEi+hTFJvOtbs7lA== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) by VI1PR04MB10050.eurprd04.prod.outlook.com (2603:10a6:800:1db::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6954.19; Wed, 8 Nov 2023 14:12:42 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::7102:259:f268:5321]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::7102:259:f268:5321%6]) with mapi id 15.20.6977.011; Wed, 8 Nov 2023 14:12:42 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next 07/13] selftests: mptcp: print TEST_COUNT in outputs Date: Wed, 8 Nov 2023 22:11:48 +0800 Message-Id: X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SG2PR02CA0040.apcprd02.prod.outlook.com (2603:1096:3:18::28) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: HE1PR0402MB3497:EE_|VI1PR04MB10050:EE_ X-MS-Office365-Filtering-Correlation-Id: 0936906c-3120-489b-f30e-08dbe064c5b1 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: HvsZK0I2gYaba2wOW+/E2YNqAwIIPUIgl0VsZ+1jLJqYeIvRBBtzHzXCNDizVCLWlOdDxybXCQzD79iX7hNGKL3rO/LxAmp9XIr0EkBUgvuIsBISlMJJrfGKOMfqxf/6m2cVxH+0mg9wmGJgFVwicvwXcCQnd9ATKn+WM+aUKDJnoK6HfV+C1ExiDb9ErlGEXuOe+k1u9WzN/dYUE/5SznHO/Hc89S3wZvVJAmRVegV5RW7bArzXjOpWbyUU2ofby1CJ9g+LqyYNprX9TcdzZLY0rHNorL7S7YLUT9I/IX0+V9HFeKhMXo8lZtNo9bAI+z5t49k79HwooHmQ5eMpQMx586/ZxlGGTvkd5qLgllwQArTUzk7h8pMBVr2oqhGX4G6XX1P7r7t1KnF32+PFrsKpLEXGXOiOsQFvmnoRza6gCwrNaE8VXA6pt+eifqSmSsJyR0HCiQHW3THq9UziGro0Rx4zNQtB1HRFsfA0JEdi/yoY1hG9/QHGNBS5dd/1jjDezy6/jEUNDjfMX/rA45Jz2CY9QcdQoOP4jrIwh9jvhbj9BJQOiicHRK37EOj1 X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(136003)(39850400004)(346002)(366004)(396003)(376002)(230922051799003)(186009)(1800799009)(64100799003)(451199024)(26005)(478600001)(6512007)(107886003)(6506007)(83380400001)(4326008)(44832011)(5660300002)(66476007)(66556008)(41300700001)(6916009)(8936002)(8676002)(6486002)(316002)(66946007)(2616005)(38100700002)(2906002)(36756003)(86362001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?iJ83Z5nGtVGb2nQHGBL2twduOU/vEnYkDCO3rI+LQfjd7PMp5XD0Ld9Snm3k?= =?us-ascii?Q?2WDjc4cziKfm+2yKQ7j9Jo0pvBP3HhmTMd7V1tqrKkxt+OoJOVpDa1UsATUB?= =?us-ascii?Q?fZuKVNYlAsGkBslYhCdRgQ2tgaA3UvZo8Ne5rNcQDLASyw6MIkXXxcIYVWJY?= =?us-ascii?Q?gP+aXbQBzFKPsUkE5BoV2akFXLus6x4Uwz2aUvotGkdzH4NkN8nIHhrMRW2r?= =?us-ascii?Q?mzT5SYDJbLjxo/4woBilHwrvWxSfuE5qRsdIt/LIhqQ3LPMkeMYtEkIDMQL+?= =?us-ascii?Q?lR48XwmqVYYXgaKiFVp+pDUCUZYfpH1SIcxm5aS1Wr+yU1UxAehkA8jo/iq2?= =?us-ascii?Q?KQfNb7KszpNpNhGMD2L/t5vqJevQjbEk/0tHWeOmimABOtzUIZOPoUI4Iv8C?= =?us-ascii?Q?V5rkrMQQs5EcXMkQv8thux2GuQE8/S1EWeKFJxOnlolRFRdAee5hSbSM/cQ9?= =?us-ascii?Q?aLpErdguR0uFNZB0SFse3kBEf6YXTfEhT7UtKvwv2pjickZjcYg0HrhvUGrK?= =?us-ascii?Q?wNzPPkVP4uRd1EzgHm7FgEN4Mxc0QwG4IELdfk0o9HKaED6JYIRl02Qd35at?= =?us-ascii?Q?Q0PDSEAKx8DAEWgfUmFKJ0sPYc3mRiQr688DVzv5BzLam2JjPQh3IEA+o4fD?= =?us-ascii?Q?ZMsgzyTbw2oiYd/HmxNUfaGX6LNv8bGw/XFlnCkMu/lE7TdWNYYC32PfGeMQ?= =?us-ascii?Q?nW5ueiA7ehoDUwNygt7EJBZIi3eKnFA5/hBQSrcEn0dRQK2A/0lK8l8agphU?= =?us-ascii?Q?sWzBCVw1I+HsHlAwcWTvyF6duvcV40BYiYpF9F8CnYjOdr07DIyuxJLf3Myb?= =?us-ascii?Q?/IRDlgOa0A1V9N/X6dN5MIupsysi3Sz8lKOu5s3c4wKawpIrqhoH98j0aPNV?= =?us-ascii?Q?ZGfeNASPio1ppAJnmwwkudvwEUWbOBJr5+4MOKAMdlt/Ra1Mr5Pq4iNe49Yc?= =?us-ascii?Q?7Fw4he254LMBLNxXhkV99TeFXxdQIm024wgF0rZgOSG2abIhrX7G4JjxrQSI?= =?us-ascii?Q?Y3vIm62qQ33eNmB7z8V2MJnsFRbxu7qK0q4r/p9QsJD85QHW7ByaroyjlyhS?= =?us-ascii?Q?YZXPdY0z2o8ESV9tOUGH5jxQb0dakRS5icFXhx9NLK83CQ2jBYipG+XRIDC6?= =?us-ascii?Q?TBKuY4W8SznUUST1Rch9ScZSR9S1NOWtEB1zFHiCpXWwhCCbFqclruB5Evp9?= =?us-ascii?Q?TfayLvTXgJ8qsOo+Vkn5pU5iOndF10J5JjwD/kQxVcD0NWabP2tDYa+Focvl?= =?us-ascii?Q?vNDz3lnAL8LbkQVsY0Cxopi1xuxNyLc54tHRnQbf5TGBHD5SzrCi579/M2Ry?= =?us-ascii?Q?PHZ1BhhWxIwKbBlxh1az6j4wDPdd11fZqsS8P/NHgEoVfpNsVYZdai3YWbAN?= =?us-ascii?Q?4NUql1PVDur/IUOgRhCncJunpXkQ0urHO1wt1R+LT1sGaVHm9w5riIAYa+7H?= =?us-ascii?Q?fvxod7S6pdSSzr9t/fLIF4gLZBVJLW4LkbVHuCS1LVuAhxZC6YTUby3duE5v?= =?us-ascii?Q?LC7w35epXzBr7Ke+8U5ZxtCEKdEfSugYg14M3X5tZ1NDPn/NduqDp8fOvI2e?= =?us-ascii?Q?9eovi5UBHTnmlQiBmwN6oGETbFcAD+EWQvySCEIb?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0936906c-3120-489b-f30e-08dbe064c5b1 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Nov 2023 14:12:42.4202 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: HLVSYgofhEb1p57D0ZlZdZjfhxu2JPYHyY/DoQ+2IkGkSrNHBShXpCbCXapCspO4KT9+uNqjJhuHSlJtSSK18Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB10050 Content-Type: text/plain; charset="utf-8" This patch prints out TEST_COUNT for every tests in the scripts diag.sh, mptcp_connect.sh, mptcp_sockopt.sh, pm_netlink.sh, simult_flows.sh and userspace_pm.sh. The output looks like: 01 no msk on netns creation [ ok ] 02 listen match for dport 10000 [ ok ] 03 listen match for sport 10000 [ ok ] 04 listen match for saddr and sport [ ok ] 05 all listen sockets [ ok ] INFO: Init 01 Created network namespaces ns1, ns2 [ ok ] INFO: Make connections 02 Established IPv4 MPTCP Connection ns2 =3D> ns1 [ ok ] 03 Established IPv6 MPTCP Connection ns2 =3D> ns1 [ ok ] INFO: Announce tests 04 ADD_ADDR 10.0.2.2 (ns2) =3D> ns1, invalid token [ ok ] 05 ADD_ADDR id:14 10.0.2.2 (ns2) =3D> ns1, reuse port [ ok ] Signed-off-by: Geliang Tang --- tools/testing/selftests/net/mptcp/diag.sh | 6 +++--- .../selftests/net/mptcp/mptcp_connect.sh | 21 ++++++++++++------- .../selftests/net/mptcp/mptcp_sockopt.sh | 15 +++++++++++++ .../testing/selftests/net/mptcp/pm_netlink.sh | 3 ++- .../selftests/net/mptcp/simult_flows.sh | 6 +++--- .../selftests/net/mptcp/userspace_pm.sh | 4 +++- 6 files changed, 40 insertions(+), 15 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/diag.sh b/tools/testing/self= tests/net/mptcp/diag.sh index 0e8fbb55db8f..697afb205374 100755 --- a/tools/testing/selftests/net/mptcp/diag.sh +++ b/tools/testing/selftests/net/mptcp/diag.sh @@ -7,7 +7,7 @@ sec=3D$(date +%s) rndh=3D$(printf %x $sec)-$(mktemp -u XXXXXX) ns1=3D"ns1-$rndh" ksft_skip=3D4 -TEST_COUNT=3D1 +TEST_COUNT=3D0 timeout_poll=3D30 timeout_test=3D$((timeout_poll * 2 + 1)) ret=3D0 @@ -61,7 +61,7 @@ __chk_nr() =20 nr=3D$(eval $command) =20 - printf "%-50s" "$msg" + printf "%02u %-50s" "$((TEST_COUNT+1))" "$msg" if [ $nr !=3D $expected ]; then if [ $nr =3D "$skip" ] && ! mptcp_lib_expect_all_features; then mptcp_lib_print_warn "[ skip ] Feature probably not supported" @@ -111,7 +111,7 @@ wait_msk_nr() sleep 1 done =20 - printf "%-50s" "$msg" + printf "%02u %-50s" "$((TEST_COUNT+1))" "$msg" if [ $i -ge $timeout ]; then mptcp_lib_print_err "[ fail ] timeout while expecting $expected max $max= last $nr" mptcp_lib_result_fail "${msg} # timeout" diff --git a/tools/testing/selftests/net/mptcp/mptcp_connect.sh b/tools/tes= ting/selftests/net/mptcp/mptcp_connect.sh index b28d7d3ce4de..74a94efe85f5 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_connect.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_connect.sh @@ -280,7 +280,8 @@ check_mptcp_disabled() return 1 fi =20 - echo -n -e "New MPTCP socket can be blocked via sysctl\t\t" + TEST_COUNT=3D$((TEST_COUNT+1)) + echo -n -e "0${TEST_COUNT} New MPTCP socket can be blocked via sysctl\t\t" mptcp_lib_print_ok "\t [ OK ]" mptcp_lib_result_pass "New MPTCP socket can be blocked via sysctl" return 0 @@ -349,7 +350,8 @@ do_transfer() local addr_port addr_port=3D$(printf "%s:%d" ${connect_addr} ${port}) local result_msg - result_msg=3D"$(printf "%.3s %-5s -> %.3s (%-20s) %-5s" ${connector_ns} $= {cl_proto} ${listener_ns} ${addr_port} ${srv_proto})" + result_msg=3D"$(printf "%02u %.3s %-5s > %.3s (%-20s) %-5s" \ + ${TEST_COUNT} ${connector_ns} ${cl_proto} ${listener_ns} ${addr_port} ${= srv_proto})" printf "%s\t" "${result_msg}" =20 if $capture; then @@ -654,7 +656,8 @@ run_test_transparent() # following function has been exported (T). Not great but better than # checking for a specific kernel version. if ! mptcp_lib_kallsyms_has "T __ip_sock_set_tos$"; then - echo "INFO: ${msg} not supported by the kernel: SKIP" + TEST_COUNT=3D$((TEST_COUNT+1)) + echo "${TEST_COUNT} INFO: ${msg} not supported by the kernel: SKIP" mptcp_lib_result_skip "${TEST_GROUP}" return fi @@ -671,7 +674,8 @@ table inet mangle { } EOF if [ $? -ne 0 ]; then - echo "SKIP: $msg, could not load nft ruleset" + TEST_COUNT=3D$((TEST_COUNT+1)) + echo "${TEST_COUNT} SKIP: $msg, could not load nft ruleset" mptcp_lib_fail_if_expected_feature "nft rules" mptcp_lib_result_skip "${TEST_GROUP}" return @@ -688,7 +692,8 @@ EOF ip -net "$listener_ns" $r6flag rule add fwmark 1 lookup 100 if [ $? -ne 0 ]; then ip netns exec "$listener_ns" nft flush ruleset - echo "SKIP: $msg, ip $r6flag rule failed" + TEST_COUNT=3D$((TEST_COUNT+1)) + echo "${TEST_COUNT} SKIP: $msg, ip $r6flag rule failed" mptcp_lib_fail_if_expected_feature "ip rule" mptcp_lib_result_skip "${TEST_GROUP}" return @@ -698,7 +703,8 @@ EOF if [ $? -ne 0 ]; then ip netns exec "$listener_ns" nft flush ruleset ip -net "$listener_ns" $r6flag rule del fwmark 1 lookup 100 - echo "SKIP: $msg, ip route add local $local_addr failed" + TEST_COUNT=3D$((TEST_COUNT+1)) + echo "${TEST_COUNT} SKIP: $msg, ip route add local $local_addr failed" mptcp_lib_fail_if_expected_feature "ip route" mptcp_lib_result_skip "${TEST_GROUP}" return @@ -855,7 +861,8 @@ mptcp_lib_result_code "${ret}" "ping tests" stop_if_error "Could not even run ping tests" =20 [ -n "$tc_loss" ] && tc -net "$ns2" qdisc add dev ns2eth3 root netem loss = random $tc_loss delay ${tc_delay}ms -echo -n "INFO: Using loss of $tc_loss " +TEST_COUNT=3D$((TEST_COUNT+1)) +echo -n "0${TEST_COUNT} INFO: Using loss of $tc_loss " test "$tc_delay" -gt 0 && echo -n "delay $tc_delay ms " =20 reorder_delay=3D$(($tc_delay / 4)) diff --git a/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh b/tools/tes= ting/selftests/net/mptcp/mptcp_sockopt.sh index 44095b274c40..b965c12470b5 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh @@ -184,6 +184,8 @@ do_transfer() wait $spid local rets=3D$? =20 + TEST_COUNT=3D$((TEST_COUNT+1)) + printf "%02u %-25s %35s" "$TEST_COUNT" "transfer ${ip}" " " if [ ${rets} -ne 0 ] || [ ${retc} -ne 0 ]; then echo " client exit code $retc, server $rets" 1>&2 echo -e "\nnetns ${listener_ns} socket stat for ${port}:" 1>&2 @@ -197,7 +199,10 @@ do_transfer() ret=3D1 return 1 fi + mptcp_lib_print_ok "[ ok ]" =20 + TEST_COUNT=3D$((TEST_COUNT+1)) + printf "%02u %-25s %35s" "$TEST_COUNT" "mark ${ip}" " " if [ $local_addr =3D "::" ];then check_mark $listener_ns 6 || retc=3D1 check_mark $connector_ns 6 || retc=3D1 @@ -213,6 +218,7 @@ do_transfer() mptcp_lib_result_code "${rets}" "transfer ${ip}" =20 if [ $retc -eq 0 ] && [ $rets -eq 0 ];then + mptcp_lib_print_ok "[ ok ]" return 0 fi =20 @@ -243,23 +249,29 @@ do_mptcp_sockopt_tests() ip netns exec "$ns3" ./mptcp_sockopt lret=3D$? =20 + TEST_COUNT=3D$((TEST_COUNT+1)) + printf "%02u %-25s %35s" "$TEST_COUNT" "sockopt v4" " " if [ $lret -ne 0 ]; then echo "FAIL: SOL_MPTCP getsockopt" 1>&2 mptcp_lib_result_fail "sockopt v4" ret=3D$lret return fi + mptcp_lib_print_ok "[ ok ]" mptcp_lib_result_pass "sockopt v4" =20 ip netns exec "$ns3" ./mptcp_sockopt -6 lret=3D$? =20 + TEST_COUNT=3D$((TEST_COUNT+1)) + printf "%02u %-25s %35s" "$TEST_COUNT" "sockopt v6" " " if [ $lret -ne 0 ]; then echo "FAIL: SOL_MPTCP getsockopt (ipv6)" 1>&2 mptcp_lib_result_fail "sockopt v6" ret=3D$lret return fi + mptcp_lib_print_ok "[ ok ]" mptcp_lib_result_pass "sockopt v6" } =20 @@ -282,6 +294,8 @@ run_tests() =20 do_tcpinq_test() { + TEST_COUNT=3D$((TEST_COUNT+1)) + printf "%02u %-25s %35s" "$TEST_COUNT" "TCP_INQ: $*" " " ip netns exec "$ns3" ./mptcp_inq "$@" local lret=3D$? if [ $lret -ne 0 ];then @@ -290,6 +304,7 @@ do_tcpinq_test() mptcp_lib_result_fail "TCP_INQ: $*" return $lret fi + mptcp_lib_print_ok "[ ok ]" =20 mptcp_lib_print_info "PASS: TCP_INQ cmsg/ioctl $@" mptcp_lib_result_pass "TCP_INQ: $*" diff --git a/tools/testing/selftests/net/mptcp/pm_netlink.sh b/tools/testin= g/selftests/net/mptcp/pm_netlink.sh index 3b0512ff5d54..853dbd2eef41 100755 --- a/tools/testing/selftests/net/mptcp/pm_netlink.sh +++ b/tools/testing/selftests/net/mptcp/pm_netlink.sh @@ -56,8 +56,9 @@ check() local msg=3D"$3" local out=3D`$cmd 2>$err` local cmd_ret=3D$? + TEST_COUNT=3D$((TEST_COUNT+1)) =20 - printf "%-50s" "$msg" + printf "%2u %-47s" "$TEST_COUNT" "$msg" if [ $cmd_ret -ne 0 ]; then mptcp_lib_print_err "[FAIL] command execution '$cmd' stderr " cat $err diff --git a/tools/testing/selftests/net/mptcp/simult_flows.sh b/tools/test= ing/selftests/net/mptcp/simult_flows.sh index 2ab0e649031a..938844477fe4 100755 --- a/tools/testing/selftests/net/mptcp/simult_flows.sh +++ b/tools/testing/selftests/net/mptcp/simult_flows.sh @@ -12,7 +12,7 @@ capture=3Dfalse ksft_skip=3D4 timeout_poll=3D30 timeout_test=3D$((timeout_poll * 2 + 1)) -TEST_COUNT=3D1 +TEST_COUNT=3D0 ret=3D0 bail=3D0 slack=3D50 @@ -241,7 +241,7 @@ run_test() # completion (see mptcp_connect): 200ms on each side, add some slack time=3D$((time + 400 + slack)) =20 - printf "%-60s" "$msg" + printf "%02u %-60s" "$((TEST_COUNT+1))" "$msg" do_transfer $small $large $time lret=3D$? mptcp_lib_result_code "${lret}" "${msg}" @@ -250,7 +250,7 @@ run_test() [ $bail -eq 0 ] || exit $ret fi =20 - printf "%-60s" "$msg - reverse direction" + printf "%02u %-60s" "$((TEST_COUNT+1))" "$msg - reverse direction" do_transfer $large $small $time lret=3D$? mptcp_lib_result_code "${lret}" "${msg}" diff --git a/tools/testing/selftests/net/mptcp/userspace_pm.sh b/tools/test= ing/selftests/net/mptcp/userspace_pm.sh index 613fdb289881..7f4aaca032dd 100755 --- a/tools/testing/selftests/net/mptcp/userspace_pm.sh +++ b/tools/testing/selftests/net/mptcp/userspace_pm.sh @@ -50,6 +50,7 @@ ns1=3D"ns1-$rndh" ns2=3D"ns2-$rndh" ret=3D0 TEST_NAME=3D"" +TEST_COUNT=3D0 =20 _printf() { stdbuf -o0 -e0 printf "${@}" @@ -64,8 +65,9 @@ print_title() print_test() { TEST_NAME=3D"${1}" + TEST_COUNT=3D$((TEST_COUNT+1)) =20 - _printf "%-63s" "${TEST_NAME}" + _printf "%02u %-63s" "${TEST_COUNT}" "${TEST_NAME}" } =20 test_pass() --=20 2.35.3 From nobody Sat May 18 15:08:20 2024 Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on2080.outbound.protection.outlook.com [40.107.21.80]) (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 EDFA6199B1 for ; Wed, 8 Nov 2023 14:12:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=suse.com header.i=@suse.com header.b="CpKw+POO" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=H1NXuP9mWE1azu34hYzbskE0i08aU1dHKD3ZDHx4/Js7t+jWeXGrAQOUa/34+6AALxmaC0x0cx3irQniMOh3W8p7iGEdVOJOZs3T9E6eDEHFweFXWWZhwjUksxroK90MN8cbMfFXvIoNDyeGGP+7zlyhHF9xW2cbJvQm4bmZgALArxvcSQ5MAKXwIKAm4oqZqF3Lf5SnqgITMJrP+7NFgWv2PF3cOff+t7CUILdl/XcR1fjAle43qvmCVgtVjZs3N8ZflUhgveRfN/Q6ctPhDvU+RPU7Slwp4qf37UuUjw1L9/sfnyzFaj6yeDJTDYz8R0+Z3OmcIMM5q1GGvmyapQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=0Fru6z/gNg1/kkNh+Kf1tK3N7k4nyYd9QusDMiFdlX4=; b=hoUDrY98ajolDszf2IIPtZzPY6T5ZWikGc6bTgp3ZNlSeGG/YCiSYNTQQNwBz2ByaH40iCZxQwf1cJNoEdwg6YaO6u+JcsIHIK3RLh/yuK/3xY91J/QcOHRtJ8PSsDIRc5Ciw2iP/2eJKVwi2dd+uPCipQ91UmCMfmvcOtfrMpg74htnvo/TmXTfL/8E7Lg54FzgTpB2BQtbvfr9DuTwdJLAJgYvb9AkyFhOmR/2eztFRwwsrMRaDebHawE3u7vmjFN+wEhf6A8CKHXHxbqFkEy5tvGMXURFID9leVwRhve3zy4IRdoAEccOHb5WD3Wr2lEUlsde9tqwMj+uUnGe5Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=0Fru6z/gNg1/kkNh+Kf1tK3N7k4nyYd9QusDMiFdlX4=; b=CpKw+POOI+KM0fUuhlhhcDJyIgSrOwqPlSjvscjPaDGMIusUC4llsaXZUVO9/rO2Gewo2MUVm23NDrzmEhkUonm7TkqoSC+MtT6+ds9zj/74ZMLZmutXfXKlpf/IQr0GfBjrRThK0FXMR7SCN5lwfBeiittmS2u0t8N2N/G0rRIxGykc+UyGFaH2i9is5QALalAXOHTBh9Ru+33aOcB9zHX0Q5YiBeb+Ra11nWWMq5Vcc+pfK/qMZ+zTdmAr2n+WMi+5dD6cCKEW0/VUzOWmLOGBbYJgF0hzZeqCtuUwHdS/miCTGNQTmiZ3nmz7RZq4vrJIj3RMTZeu7mgfKn2Hqw== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) by VI1PR04MB10050.eurprd04.prod.outlook.com (2603:10a6:800:1db::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6954.19; Wed, 8 Nov 2023 14:12:50 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::7102:259:f268:5321]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::7102:259:f268:5321%6]) with mapi id 15.20.6977.011; Wed, 8 Nov 2023 14:12:50 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next 08/13] selftests: mptcp: extract mptcp_lib_check_expected Date: Wed, 8 Nov 2023 22:11:49 +0800 Message-Id: <37c9bf15948724cda68fb31899bfe0f3c6cd6508.1699452144.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TYCPR01CA0152.jpnprd01.prod.outlook.com (2603:1096:400:2b1::6) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: HE1PR0402MB3497:EE_|VI1PR04MB10050:EE_ X-MS-Office365-Filtering-Correlation-Id: 0efa4516-56d1-4a26-90f2-08dbe064ca63 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Z9hoZRp7yUqwjuupYsFrfX/CndQzmt7zNIvb0lQUyTDLVhLl9x3RnL0ZgPmiKnx6+cRV+GWgWdCx5/wkbAYatjimZs/fKD4ZwMInANJ9KVl6j1SkH1Jtd7e/YBQl/A/8qhN4Jz0QtU4YDlCRNtPtHYiU8m2bzFcbQv4ZEDeR4nXSB4Uf0TwbYZDxrNDnQdCH9Dj9hBPQIkpIf0ffk/aaCgh4KA4a5JRKNL8O8mGc3DUEe5KjVxm0U8ni7G7qBA/YKkRpK0RxNklM/E3mMJbMjmzvify5xZR+Q1M82y14yNrnv00W4Jm8pSeqtJ788LCX10ZvFOm8aTnwKbQs/5Cs9CIxTjKD/iF6gdd8HvUFet3K6kQk15BJo73Pc5YX1eOqY6Bp5lKJ5dR3kKrhDGZdO0iFLJaba953+ti4joHOHavPnQZPNv6uxBMpTao8jZsnhi2bzRxg6KVncyaK1P51LyNkfuC8FI+GLtl55dSNixlOZR9TZIohm2mCGFx+YepYWidtcuEQAKtcGvazcGk/2J11IMZo4XNzImMTfZM7KqlnDwGIqR9rdRm4mxU3HmA9 X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(136003)(39850400004)(346002)(366004)(396003)(376002)(230922051799003)(186009)(1800799009)(64100799003)(451199024)(26005)(478600001)(6512007)(107886003)(6506007)(83380400001)(4326008)(44832011)(5660300002)(66476007)(66556008)(41300700001)(6916009)(8936002)(8676002)(6486002)(316002)(66946007)(2616005)(38100700002)(2906002)(36756003)(86362001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?BC/t1RKzycUiHFYn1L+L2gcohlfwMjHoXbrL3r4V+DJmofUYBG8zic/rkH3F?= =?us-ascii?Q?O7CpMZU/6HMRsJlZl9zuxqLb/1NjmdBYW9sz/i04uYhUGLJk1j1USlsJ8O85?= =?us-ascii?Q?hXNPnm1p8Oo5uVKHrSpry1qp0N2C/X29wPuVcAez6hFDKQ1cDhL4Lc7ZANUG?= =?us-ascii?Q?JfUCmXRhuUiGZXcBTxF1l1v2+0pceLgRn+W57yMQL8qyagDTbYn5JWKmdPuG?= =?us-ascii?Q?4LuIgTg4IZVaYjKRFA/SFu3R90NLsfkyiLlXqr1+Iv/fGRQJBIqim+EcGkSQ?= =?us-ascii?Q?5yRbuQaIZ/4gqi5Mvnt57EtEP3qBAicxFGbZbncq4jqS4XYyPfCLoxXV4BoT?= =?us-ascii?Q?s1VaVMnvg/lRM+DLgnmZuPMUFwqFOU++M0ITC+HtmRo2ntkmJSik7k2Zrnzv?= =?us-ascii?Q?E/VgbDjbejiNo4XDlsyqMnQzEsyW+4hYSTgOsLzJ+o3fIpP+tovmpVj0UlwF?= =?us-ascii?Q?G/cBjlf3YlNwdwYOzRi9cF0fQjtKLwIUCT+juNtpVoacNo4IIJGZpo+Gwwn0?= =?us-ascii?Q?3+IV+i+DSGcwC2aKNyWglQPlAd52aLewtH4yRwtHtSQd56oh6/OtPqsygHae?= =?us-ascii?Q?j7v9eCY655bBxebNVkEdm6HUYi1oggGAkK84kqbHy7op7QBnfvuGh8OPrr52?= =?us-ascii?Q?djj5vtzjWUQtHfg3Nww0trhvTEifZoBSEekH8nNRE9y0LnQhCVfS/iB2YfC+?= =?us-ascii?Q?zab0hU8XdzhMbLG5upMcjZ6YZvBCMU27otPylWWdbC+6ZevZtH9erQRSHhE8?= =?us-ascii?Q?gRZlA8wn4VIPpY8muM9sdsWeCis8pdXOdGA3QyI4ZNFTnTAbKY8BzdKPJGxF?= =?us-ascii?Q?RKOx8UP0fX9sslcZOSaOPBpVSlrn61u92tN3klhwmcumovoBBOH3jLW1UJYC?= =?us-ascii?Q?+O8BVcghvtq8BLyqhORGk15g0UAuXMN7ii1Hl4UqICSnPhAid/tTEXkXu9FA?= =?us-ascii?Q?l17MefAcpOeHroGc6+QK7JUFwiWzW6SYjn7muuOqNfIYWUngw8cfiVucTuzB?= =?us-ascii?Q?WeCJg7jHmQ1iXfxRX8qisd3VBI5mR/dynFDJXmCF6lt4JRL29SV2V8Rbizit?= =?us-ascii?Q?9ONfPegPghkhttCxUyLle0dCjJXgzA/wBNB6ty2MGiw64XoTrawgpVFpFlPT?= =?us-ascii?Q?0x/0IGj75uvot0ExLChxh6eaQ+QP7h5lH90vEDdV00GJL3Fd0359knPZvgr8?= =?us-ascii?Q?5lHt3NOkr+MOQJoEbFs2MT976Uh12/mrKqG9PzkedGflBVQE/L6SWJIUs8RU?= =?us-ascii?Q?vgKDaoI306hUHCKLrF5kMoFKOYkWDY3er4F3Fr2hJmSMbrsDUsYIHwWkequq?= =?us-ascii?Q?l9nmhq3ues4Fb0UCc4QBB3kCTH1gfB0Xzx+FOYHA23iPCMG/PhK2WDDtuKJ2?= =?us-ascii?Q?5HRfK51q98PQU+3X8j/5C/fKEU6EezDP7b2r7JWbgsIhlyQmJ7tMp26XOzzc?= =?us-ascii?Q?gJS7XIlTxKB86git9QggD/sgEHp3I4ezXMx4eTRSyWSJiubpqH2LRU+MEtlx?= =?us-ascii?Q?Fw1wT/cQeIS41CWdGwcyNOsVhDDXEoLoJSzKc/1yIW0OGhgot70xKr1g5EVl?= =?us-ascii?Q?Q+yYuq7cqREVOMGm9hf5yE9lkpu72LfKxg4RkdU4?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0efa4516-56d1-4a26-90f2-08dbe064ca63 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Nov 2023 14:12:50.3597 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: qppw0Tt99c0Viwj3j16D5DB+odHVW1caQH6m8YTFO0n2uO3jCW3JYT1SlKjQQg4oFVD3Y2oSu/0z1eaUpV4aRA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB10050 Content-Type: text/plain; charset="utf-8" Extract the main part of check_expected() in userspace_pm.sh to a new function mptcp_lib_check_expected() in mptcp_lib.sh. It will be used in both mptcp_john.sh and userspace_pm.sh. Signed-off-by: Geliang Tang --- .../testing/selftests/net/mptcp/mptcp_lib.sh | 42 +++++++++++++++++++ .../selftests/net/mptcp/userspace_pm.sh | 41 +++--------------- 2 files changed, 47 insertions(+), 36 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_lib.sh b/tools/testing= /selftests/net/mptcp/mptcp_lib.sh index 7a68791c5773..19e6ceb2b4b0 100644 --- a/tools/testing/selftests/net/mptcp/mptcp_lib.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_lib.sh @@ -387,3 +387,45 @@ mptcp_lib_evts_remove() { =20 rm -rf "${server_evts}" "${client_evts}" } + +# $1: var name ; $2: prev ret +mptcp_lib_check_expected_one() +{ + local var=3D"${1}" + local exp=3D"e_${var}" + local prev_ret=3D"${2}" + + if [ "${!var}" =3D "${!exp}" ] + then + return 0 + fi + + if [ "${prev_ret}" =3D "0" ] + then + ret=3D1 + fi + + printf "\tExpected value for '%s': '%s', got '%s'.\n" \ + "${var}" "${!exp}" "${!var}" + return 1 +} + +# $@: all var names to check +mptcp_lib_check_expected() +{ + local rc=3D0 + local var + + for var in "${@}" + do + mptcp_lib_check_expected_one "${var}" "${rc}" || rc=3D1 + done + + if [ ${rc} -eq 0 ] + then + mptcp_lib_print_ok "[ ok ]" + return 0 + fi + + return 1 +} diff --git a/tools/testing/selftests/net/mptcp/userspace_pm.sh b/tools/test= ing/selftests/net/mptcp/userspace_pm.sh index 7f4aaca032dd..cc6e8120ed10 100755 --- a/tools/testing/selftests/net/mptcp/userspace_pm.sh +++ b/tools/testing/selftests/net/mptcp/userspace_pm.sh @@ -233,46 +233,15 @@ make_connection() fi } =20 -# $1: var name ; $2: prev ret -check_expected_one() -{ - local var=3D"${1}" - local exp=3D"e_${var}" - local prev_ret=3D"${2}" - - if [ "${!var}" =3D "${!exp}" ] - then - return 0 - fi - - if [ "${prev_ret}" =3D "0" ] - then - test_fail - fi - - _printf "\tExpected value for '%s': '%s', got '%s'.\n" \ - "${var}" "${!exp}" "${!var}" - return 1 -} - # $@: all var names to check check_expected() { - local rc=3D0 - local var - - for var in "${@}" - do - check_expected_one "${var}" "${rc}" || rc=3D1 - done - - if [ ${rc} -eq 0 ] - then - test_pass - return 0 + mptcp_lib_check_expected ${*} + if [ $? -eq 0 ]; then + mptcp_lib_result_pass "${TEST_NAME}" + else + test_fail fi - - return 1 } =20 verify_announce_event() --=20 2.35.3 From nobody Sat May 18 15:08:20 2024 Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on2074.outbound.protection.outlook.com [40.107.21.74]) (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 C7CF7171CF for ; Wed, 8 Nov 2023 14:13:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=suse.com header.i=@suse.com header.b="DolwF1Qo" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=eCujJqLQqOuVlUWrm6ic/MY3sDDN5LfMyi3zw+jjQ2H4F4ocYWu+t3ftkIh+6fTw0BoQurED+uPia5QplVnY6XG/dL2IERdMlWkNdM4BokkLYg/FK6VHXn5pIxYdJdLtgVqpqsodDYO2zAg2Y3o2G5twX8YWI/eVE4VXCLIDqKxz5S/nc8jJ/w17Yh2dy+I3IsKSutZltTKYY16HxKSBacjwkxVjvXXcoPMrPe8CD1pRwFU8Glyei71rDNccXiR2Ra1ccr77AX+1ukxoeEKcRDTuwJtVeTZd0ls1Jt4OS2XZsjfOh9I5YcQV3MuBhJ8LDZTp4rd0Z+XHae8JMTbxdQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=GK1l0Px2k88BE/NhaabN2xqe3pcsBivDH10LHbPldfQ=; b=b0/Le/HcqpiKqt8ltQsQ1y1C2o+MALF+GdCZcT1k/eEdZB2VnP894OOEA+UL/yNCLNKWp9yLddpA1hT7ONi+NX+txj31hLX0lnsX5Rmu8R2Kr8FJo2nsrbswQqj7TYQG64CBeQOLySMoUih5iZ74J6gmH4+VTakFiu0NzUM2Z7A6JdiNlQlAYknJ7SPPLnkrR18g6EWxhgWsMljC/jwApcZW3rOC8n4FUt60utJhO9Y3iR053joJdMbBqVc6OrPIPh7vjkNmb6wx+ZdynRTypN2NezsbAql4oeAEt1YQ3GVTxcSzhn163rAwsZWuF/9Ixm/WqFEXKHYWPk/9QyTWlw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=GK1l0Px2k88BE/NhaabN2xqe3pcsBivDH10LHbPldfQ=; b=DolwF1QofoF+POdG8YhfW+lf51R2lb2bA9GDp/Tp53pHwJOP2PHPBrzmzzHvZnCBlgx14nSalVHYjF0d7lAQLAy/6G+iX/p8+wgs5o0hIujUOyRPg2PU7ZQpXo7CH8ckUM9tTaqcZQ3d4kovDkRNkIZcgG+desaWoniOSpUQLG8wyYFch0EdWrNib0Y/YiuTYIula0ld2tqK5WlZHTPsvNL3FYcwj1+lKD1thDKQWEVr1QAA9vxHiBoKmizcOYIIQMi5uYAqC710XMSP/bzrJlmDapWOdDTsc3dXRu5xBclfO0S48790vC89XOcReS2/+bs9RFLZaITgVR00NbvkrA== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) by VI1PR04MB10050.eurprd04.prod.outlook.com (2603:10a6:800:1db::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6954.19; Wed, 8 Nov 2023 14:13:00 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::7102:259:f268:5321]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::7102:259:f268:5321%6]) with mapi id 15.20.6977.011; Wed, 8 Nov 2023 14:12:59 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next 09/13] selftests: mptcp: add mptcp_lib_verify_listener_events Date: Wed, 8 Nov 2023 22:11:50 +0800 Message-Id: <8519e8e8149fc74842cb6568e76d72e71d3ca975.1699452144.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TYCPR01CA0155.jpnprd01.prod.outlook.com (2603:1096:400:2b1::17) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: HE1PR0402MB3497:EE_|VI1PR04MB10050:EE_ X-MS-Office365-Filtering-Correlation-Id: cacaafb4-f8fc-433f-e702-08dbe064d011 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 6Y9juplJTvIxaYe2N8eLdARaBS+s5T7q6Uw+RQjAwW4MKaCjd3MgOETh4ufmwuzE/bL2nKVnSKXfYgqw7X2Ydtpi/3UPCsf+7BLcGraesdTQnW5wFW/lp2IrFNRfZGu45QRIxVX2lCOj7WPdwSWS73mQQkyza1nl61nHEt9dJidi3k3bV09/Bbh8wRgCsloHe/alxhOYxlVLogp3ibXvGpefHwFrbgc20xiLL6XZ/cv1sfoL7/jlYUmool5ArtidvHGAgKz0bVj2XhpCaUUNgfaos9Tfctu0uZP2AvnaDrS6eKWoIYn2wS4LgisJE92NHhFH7ZMJQFkNWKHkqCjE9xmaXbbzwEmDa2xR/AHkQnv1AkYutO3T+pAhTYzGzXpHMke+6FLuMAiP0D09uyfv+KHljEBA9QL8D+1PdsBlF7mdPS0iEou/lwHH0ZTruvUrzmoe1pEn+OIcb+PyvkrxIHLNkS2VAbh2atygA0MoRMlSPgg7wlS9eEwLJ+61ZI+UYJfkEolZp6ngpZvmTLmMpVpUa6mkHXxzqOu3O98onC1r51Au+y5eWeSYuVsx1sF7fMuAdeyVIPIhVNMlUziUvcaZsRubG/hOzJCV6pGK1qQxuaJToRXsFQomObB8VaYG X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(136003)(39850400004)(346002)(366004)(396003)(376002)(230922051799003)(186009)(1800799009)(64100799003)(451199024)(26005)(478600001)(6512007)(2013699003)(107886003)(6666004)(6506007)(83380400001)(4326008)(44832011)(5660300002)(66476007)(66556008)(41300700001)(6916009)(8936002)(8676002)(6486002)(316002)(66946007)(2616005)(38100700002)(2906002)(36756003)(86362001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?ikpPO6u+inFpXxOnOwGF0VCsZMjnxV786FrL34X1GJ19k7M/mYm30ghnGHR1?= =?us-ascii?Q?WQt+40TQm4NfBSYvFjMOOXWPXjRcXq2l+PJVhs4wABXOXFxSKBy/CyMoCJQ2?= =?us-ascii?Q?4MByxcbzZxsqQHYqHs21Eye9khIRxEUQZjgsfNxFB8NGh9m1uLOs3YA83ewu?= =?us-ascii?Q?Vcit6wMgq+m4pnRy2F13uGGJFjPCIiqUcxtAdt3wDgxnFRB/UxdboESwC4+9?= =?us-ascii?Q?eJXfIBipCmPvw3NVNj7BaiEO3sg0pgPyD50w909WGGb0b3SMZSJG37uKYmP3?= =?us-ascii?Q?UBtS93O8fQaKiFGZb07CP/Y5J58C0VTc3CngJWgsCKrpd3cDRE288i/TOj2V?= =?us-ascii?Q?rdMQ+d0bgZl1CdeE4QcmVX/D1ZqqdLQq+LC/MKjqUhZRvW6HjkIApQywXwXe?= =?us-ascii?Q?ncPb9w1pxno5WGA4vqRQoS6q7PfQcBLEjuZm5FusI9ZiszyCKleXw93bo9dJ?= =?us-ascii?Q?nQsgOFf7+KLag8WzWRnIJfpewzivc4hsAlx0RK4jHY/AYufsBTqns19kSXR4?= =?us-ascii?Q?SePuTJeKQ6MXN4+Di4YqM3AuFOFOQXH49aLlaLXXaruD07tIaUqg/kOmviYp?= =?us-ascii?Q?Pe1G5fMeoK5cXD//WBjcYogmAEgGEhVtifXEUgSV/RhiVS41tPD5HKb9mv/l?= =?us-ascii?Q?6o0WBWP++nmf56vOiINrLsQ6tuSiKl4EiMnO1qvAlqISSHrhKEgBPW1Mb+nq?= =?us-ascii?Q?8+iqEDGa9WbE7RlYjQ9xsqJh9bAQVbGsnmAjS290zJONe5AnBZRjRVONm/td?= =?us-ascii?Q?ZhUncl36wjh3BnTjRTr0yMv6CSRZcshjmoBFufBgHapA3Z40PAbtceQn/AB5?= =?us-ascii?Q?9OFPpQxgHBDHwHvLKI5p6HAEFOHBqyw7eANYxkCcmEy79iDtBpqyD2IfL3ON?= =?us-ascii?Q?3vo16h3fATQGvfTi7SYtoNI4WkQbvbEQxsnMym0lftofQPTw8Fnl8JB4Ej58?= =?us-ascii?Q?LtNnTs9ScIWhgX/TCgiOb4iG2TRlvSpdGY4O58v0WgJ5JIRhzUDGbeeZTY7P?= =?us-ascii?Q?/oC+F2PTb+sBpdPcTtEB1nIpHkBzqzVZL1900NsbcsByJlvq9LQfu42m7kPU?= =?us-ascii?Q?fw4Fkja8qpyrEeWxXNKkb0TaoEvCi20TxR8jliN+ZT1iwaAjnsL8NQRkxLLW?= =?us-ascii?Q?aKu8bGv4ExYybR2mI7tkUzARb3Q5q3IdAv/H0RuYRcx5SW9/3Jf21fIViNKP?= =?us-ascii?Q?Sg9gyP9WhEWzxoBMvZe/6WAack9R1BRce4SUOwGKQImg3woszguVxFcpa7u6?= =?us-ascii?Q?c+/dQVfk42ru8Xkuu/biOQiPgopwlAZqp6ogsIOn8Z/OG8UFzooRPsDFtefX?= =?us-ascii?Q?GsrKOg6LyQOB/a2v/YW++mUkOTvJ2Yg4UZASpCo4/MnwbJtWmk37noKjH1MF?= =?us-ascii?Q?conChr3FIlUewzmsDctr69uUs+x2i7/3hg/pWetbQvXXcvfeqd9yuV8vfPNv?= =?us-ascii?Q?DKw1yatcSK/2P4CQ6V9rlykRwNhlx7ix28LqGY//R5evNGjVyHFeGclgsiLn?= =?us-ascii?Q?EX8IRdze57mIR7gB6gLbDfzxrGKV5eIJPvKmh+9oLL8lmU9VClgykxh1lpgJ?= =?us-ascii?Q?Xnsuhcn+fyo5VEXs2Ur41rdW47aWbhvrqgDdZ1sL?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: cacaafb4-f8fc-433f-e702-08dbe064d011 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Nov 2023 14:12:59.8949 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: IyTXe6Oxu3VM6mIOliT7jrglFJJjcEEZIr7cYGdlJCHpcQXj3cE4+G1gKA6JKWJm55GB9FHvPofIxqZacj3EGw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB10050 Content-Type: text/plain; charset="utf-8" To avoid duplicated code in different MPTCP selftests, we can add and use helpers defined in mptcp_lib.sh. The helper verify_listener_events() is defined both in mptcp_join.sh and userspace_pm.sh, export it into mptcp_lib.sh and rename it with mptcp_lib_ prefix. Use this new helper in both scripts. Signed-off-by: Geliang Tang --- .../testing/selftests/net/mptcp/mptcp_join.sh | 24 ++------------- .../testing/selftests/net/mptcp/mptcp_lib.sh | 23 ++++++++++++++ .../selftests/net/mptcp/userspace_pm.sh | 30 ++++--------------- 3 files changed, 31 insertions(+), 46 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index 6d2e70785fdc..20e582d39653 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -2779,15 +2779,10 @@ backup_tests() =20 verify_listener_events() { - local evt=3D$1 local e_type=3D$2 local e_family=3D$3 local e_saddr=3D$4 local e_sport=3D$5 - local type - local family - local saddr - local sport local name =20 if [ $e_type =3D $MPTCP_LIB_LISTENER_CREATED ]; then @@ -2805,23 +2800,8 @@ verify_listener_events() return fi =20 - type=3D$(mptcp_lib_evts_get_info type "$evt" "$e_type") - family=3D$(mptcp_lib_evts_get_info family "$evt" "$e_type") - sport=3D$(mptcp_lib_evts_get_info sport "$evt" "$e_type") - if [ $family ] && [ $family =3D $AF_INET6 ]; then - saddr=3D$(mptcp_lib_evts_get_info saddr6 "$evt" "$e_type") - else - saddr=3D$(mptcp_lib_evts_get_info saddr4 "$evt" "$e_type") - fi - - if [ $type ] && [ $type =3D $e_type ] && - [ $family ] && [ $family =3D $e_family ] && - [ $saddr ] && [ $saddr =3D $e_saddr ] && - [ $sport ] && [ $sport =3D $e_sport ]; then - print_ok - return 0 - fi - fail_test "$e_type:$type $e_family:$family $e_saddr:$saddr $e_sport:$spor= t" + mptcp_lib_verify_listener_events ${*} + [ $? -eq 1 ] && fail_test "$e_type $e_family $e_saddr $e_sport" } =20 add_addr_ports_tests() diff --git a/tools/testing/selftests/net/mptcp/mptcp_lib.sh b/tools/testing= /selftests/net/mptcp/mptcp_lib.sh index 19e6ceb2b4b0..1617e1bd6785 100644 --- a/tools/testing/selftests/net/mptcp/mptcp_lib.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_lib.sh @@ -429,3 +429,26 @@ mptcp_lib_check_expected() =20 return 1 } + +mptcp_lib_verify_listener_events() { + local evt=3D$1 + local e_type=3D$2 + local e_family=3D$3 + local e_saddr=3D$4 + local e_sport=3D$5 + local type + local family + local saddr + local sport + + type=3D$(mptcp_lib_evts_get_info type "$evt" "$e_type") + family=3D$(mptcp_lib_evts_get_info family "$evt" "$e_type") + if [ $family ] && [ $family =3D $AF_INET6 ]; then + saddr=3D$(mptcp_lib_evts_get_info saddr6 "$evt" "$e_type") + else + saddr=3D$(mptcp_lib_evts_get_info saddr4 "$evt" "$e_type") + fi + sport=3D$(mptcp_lib_evts_get_info sport "$evt" "$e_type") + + mptcp_lib_check_expected "type" "family" "saddr" "sport" +} diff --git a/tools/testing/selftests/net/mptcp/userspace_pm.sh b/tools/test= ing/selftests/net/mptcp/userspace_pm.sh index cc6e8120ed10..fba15905b890 100755 --- a/tools/testing/selftests/net/mptcp/userspace_pm.sh +++ b/tools/testing/selftests/net/mptcp/userspace_pm.sh @@ -840,32 +840,12 @@ test_prio() =20 verify_listener_events() { - local evt=3D$1 - local e_type=3D$2 - local e_family=3D$3 - local e_saddr=3D$4 - local e_sport=3D$5 - local type - local family - local saddr - local sport - - if [ $e_type =3D $MPTCP_LIB_LISTENER_CREATED ]; then - print_test "CREATE_LISTENER $e_saddr:$e_sport" - elif [ $e_type =3D $MPTCP_LIB_LISTENER_CLOSED ]; then - print_test "CLOSE_LISTENER $e_saddr:$e_sport" - fi - - type=3D$(mptcp_lib_evts_get_info type $evt $e_type) - family=3D$(mptcp_lib_evts_get_info family $evt $e_type) - sport=3D$(mptcp_lib_evts_get_info sport $evt $e_type) - if [ $family ] && [ $family =3D $AF_INET6 ]; then - saddr=3D$(mptcp_lib_evts_get_info saddr6 $evt $e_type) + mptcp_lib_verify_listener_events ${*} + if [ $? -eq 0 ]; then + mptcp_lib_result_pass "${TEST_NAME}" else - saddr=3D$(mptcp_lib_evts_get_info saddr4 $evt $e_type) + test_fail fi - - check_expected "type" "family" "saddr" "sport" } =20 test_listener() @@ -881,6 +861,7 @@ test_listener() # Capture events on the network namespace running the client :>$client_evts =20 + print_test "Listener event LISTENER_CREATED 10.0.2.2:$client4_port" # Attempt to add a listener at 10.0.2.2: ip netns exec $ns2 ./pm_nl_ctl listen 10.0.2.2\ $client4_port & @@ -900,6 +881,7 @@ test_listener() rport $client4_port token $server4_token sleep 0.5 =20 + print_test "Listener event LISTENER_CLOSED 10.0.2.2:$client4_port" # Delete the listener from the client ns, if one was created mptcp_lib_kill_wait $listener_pid =20 --=20 2.35.3 From nobody Sat May 18 15:08:20 2024 Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04on2050.outbound.protection.outlook.com [40.107.8.50]) (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 D99C3171CF for ; Wed, 8 Nov 2023 14:13:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=suse.com header.i=@suse.com header.b="oc9/oR6I" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JUHqOF5Gd7hxEePv73swGMIhQ7zCZDP+9PPKonfVjEDwbxWV17bJCYnyTWLbkGHmd2fbR4Uj7pCzhJnR2sSxgXlB3rCiGydIyRil/IVUdt6Tky/JFsor9015DjBDkjAfiqYRs7Q6lqDu20pFE6/zullh5SgI+Ay7cQam6g5KUXVoLjJ9DWNdNij6FeEyGFdRmOA5BzMUtHu/NAnxbRDQHMqLalyHGDsYkOXWiEJwDFnovoK3YYRBMRCMDSq9fK9y9Ak0X8J1jBac/ryg23MoR89I3fmNdVZF67tlhMvV/mZQdsIaxt1LlYW8RjqAjgbQzYFsKZL1Xd7iWJgF/is5HQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=OTthkCzIMnah0chDOTUoCvMSB0ROLYlygZu6oySuiEE=; b=JoPEk0ZtJO91oDIAeQt+YzHQREJACvJKCg+T/+OIT2v8NymOVB54FY0E2Mz7Ewfmq1rep2Ud1+FW6qOrC2ZEUxKdOmBowk40hiqllYjHLoYLOJI+9Rri83Lv/K7aLgpm2BUa05dUS4aAfzFswI1ao+imFlu/HXV6fD5Z7qCeLG1a+dDPuQC9Yv+XQK5hNZrfmT5GU3bs7aXWSYd7RcaikjQIxHhper5khW6+73JaM1J3SQtxpq+iZ0Q5oIPw429JwLDyq9HhX0k+BE5V7pQ+xMjffh+g4/fDV0Ouu6/B62VIyUA4TyXiruCY/z3ulIPqqoHsCb5puWcosEW2GNq3hw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=OTthkCzIMnah0chDOTUoCvMSB0ROLYlygZu6oySuiEE=; b=oc9/oR6Ils9nq0bKNN9jpuFugry9lFWQdG/rsvdhVDVUO50PZaCneiFi1hasPlCV0hWUMv2Kmc3GS6o/izE7TW2yRva6yU2YIz2K0gtk4Tuk2QjP2rEH8Nkanig9jGb6Qja89mu+Jo2q1bZs8/WagkUWsiq5Lvx2UOU21FW8q+LUOOe/ge0Z2p5D77+0U1aFzDAw3uXsuGMbJWkbd+iO9z5QrWsG1BnmGEAQoGySsuWti1WMpAFq5oIEhfJW3DQq7SG2amJQqV167D1fQI77ajlvMm0eyYpt+CcmzGvm6r0FjZXNcdKZjZyYMPS/98AEQqlCuFgJnMYyNme5tvzVOA== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) by VI1PR04MB10050.eurprd04.prod.outlook.com (2603:10a6:800:1db::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6954.19; Wed, 8 Nov 2023 14:13:08 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::7102:259:f268:5321]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::7102:259:f268:5321%6]) with mapi id 15.20.6977.011; Wed, 8 Nov 2023 14:13:08 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next 10/13] selftests: mptcp: add mptcp_lib_init_ns helper Date: Wed, 8 Nov 2023 22:11:51 +0800 Message-Id: <81c3771b575c088185f90fc76d9e2f69648a377d.1699452144.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TYAPR01CA0013.jpnprd01.prod.outlook.com (2603:1096:404::25) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: HE1PR0402MB3497:EE_|VI1PR04MB10050:EE_ X-MS-Office365-Filtering-Correlation-Id: 5ca209e7-ce8e-4772-44ef-08dbe064d525 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 9RvxVy24+t1+ZB/S+tWzvPlAY2FEhTKzIlnMTU+UrC3m9AjYmfYUUQvXPyoI+UVdOgLPKYPQtIXKFhZ4VY9j9zWOeWq3Yesp8MfUNlzaC0bi1QptYIYpgj95hIFIr0TKMH4mzpj5fk3TZMOnhMSOPXvBvoqY8FVvanNL83LdPxyoxns54/ms1RQHVOWZspPDtGDiD0HBfwUsddvGgJrTEgvqVziEUmcKHK/R/3i80X5O5cx2c44p1kv2+p+8q28fDAGrOhv5sT+Y4F9NjV5qYUQlri3FY6o1Oy3QsepdIvUCudt2u8NYuuTcJpAyI1/uX6AbiFNeLi9lrTVEEkGwh7UhJNZw932oyqlQrG/6dIHZCKZSEECnqyflQ92R7exX4ac9a1VX7OI0+zfASaL1Z1VPT777Be2blj/niFgf7Ljwg6PCV1U01yjaRqbyoYifiXNWCFS5d4EnY4KH37eKI6155CXd+okYFwQecObzkyfpYLh3TmatU4o6n7tQSkq3AHOQnYjvRcY1U9wVOhDLQn90ih7CzJBMHHmU946i4Z4AfWXwHnib49scALaacXoT X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(136003)(39850400004)(346002)(366004)(396003)(376002)(230922051799003)(186009)(1800799009)(64100799003)(451199024)(26005)(478600001)(6512007)(107886003)(6666004)(6506007)(83380400001)(4326008)(44832011)(5660300002)(66476007)(66556008)(41300700001)(6916009)(8936002)(8676002)(6486002)(316002)(66946007)(2616005)(38100700002)(2906002)(36756003)(86362001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?NQNT7BBXVbK3VTOXe0dq1S5gmsBmaCUf1QbIJmuy463EFX18AqH8ma5p2gPy?= =?us-ascii?Q?X/Afk+yu6xJ4k+fGrFGXFLsk63ZRMkPT8Kg5Gv2kIn0uDhZq9CDLDmJ1+Lvt?= =?us-ascii?Q?1CogOQ6f8YFbtMC6qLrjxTFEEI1MLDlyGL6xwf10iWJ4CCW4iWCOX9otgmqL?= =?us-ascii?Q?pVW8DiGNV6Ga8WQsKjEodBMDXE0YyFw3lQc3uHYYxgTLL1wv9vWlC92y+mbN?= =?us-ascii?Q?3JnuFb/OiOs0UVUar7+DSw5NpHu6TFyOKQtpeoI+7Wn1dzCfTeCCJbcICWsy?= =?us-ascii?Q?6ibVtPlvQBp6Gc7WzL0h68g9K5XY9ZRUtixZV7XCaN8+eYRAMzRmbLUW8ixf?= =?us-ascii?Q?yeFT7FmtLBbDagOHcPgIRcMosqTvD4GKuCxVbnhMG4GY7W+EwG4UGg6zgJil?= =?us-ascii?Q?aCMN382MskEKkYfm7Af5Syy4wISxEsavR77Q+1WY2o8VzOGpMs3nOlxoQHrM?= =?us-ascii?Q?HKjtznv+6vH+w284M8CGm3lGB22j60xfK0dwHyQrrwBayj3t6/saYNJD8DZj?= =?us-ascii?Q?3ugt9zPAWkSrjKvGm3zuB01RpZMeaM9tJvfEXT3jrgpMZdRrHbeMwXvU7Dc3?= =?us-ascii?Q?Mbaqkfh/XR6UQ07gcl6hvnaaxwTwxwtJrY1E1Iw/gCdftQtuxhrbgOOZRb/E?= =?us-ascii?Q?78H1rf8gYGemld7Evx7KCdV6WvFQE2Ku6hT/yuKCNaB6ErUZfAMJmGIQu5Gu?= =?us-ascii?Q?JN1TipeaYZ48ZsuscQ/KozniWKq07oeCbBWW6ffwteZVkqstxJyaSU2Whq20?= =?us-ascii?Q?IV8oSuBo+y81YEaSblNxY1BCmHOfKdFBasKnGpHBymRLStRNg5FUzx3fc/o0?= =?us-ascii?Q?5YW6fV6ARQSPAaqBildn2S6tsWCjfMJ4KbIbqH8Pu2LdgseESmOQxTDhhPOA?= =?us-ascii?Q?Mk37Jg5JmmnyTWhpMM5hcRdvp+EY9dv7tcliHgP+/PMjvUPVl+t4tkgdUhre?= =?us-ascii?Q?0Cv7haOyiv0QnvaeAkmjPMwcoSOtpxwk3WKLSG+0aesVZXD6T2LdFIjeh78I?= =?us-ascii?Q?MKxilOjgbpOc10gmRQ9+Fe540Tkr/A8uVqIhvOKVglUV82NvK32kFOFbufW5?= =?us-ascii?Q?gj9u9c3sJbdXDtPAy0YS4mjFpY43Ebpe0LkQTcpJTUrxiSZpqM620TCQvjK/?= =?us-ascii?Q?HPgO4dfSvNO8DUB8t7adis/W0Sp4iR4yRX1wLph/fWPiCM4qm+QqTKSklbYL?= =?us-ascii?Q?sqnIF1r//Xcf164jZrwler0tql8xa3aMXpxw1VraorjVVSZPereJy+9WZD+a?= =?us-ascii?Q?dMOd3lQvJ26WozBaUhlqcCjpGiLV1HFr/K90nua1L6BLfvPJOdBdRbnwYjly?= =?us-ascii?Q?/40akQo3iORCfNvuBFMq9sVOfEhxOOyeVzOOpkOAT/5HQl13HShlnYvNruqF?= =?us-ascii?Q?6zk85R/2MCBe6ka6NaPqZ1pcr61PjdW/WBPgvxTK0l8Tb3Zm/uvtPoxzrRcw?= =?us-ascii?Q?NAx+W0dTV9usnKCGB/c2/YfsRX8EUKjP1tsB095yTYyG2Y8iPxR/yDMZFj1W?= =?us-ascii?Q?niH3aNjhCkWLy5RiZZKzhXw26g5WhE9g+JPRhiii+EKB+ROCm3jBvdP569Hn?= =?us-ascii?Q?5Hezs09kKt1Zlv2J4PH3EuRLAo3oRf32yf/cb8lq?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5ca209e7-ce8e-4772-44ef-08dbe064d525 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Nov 2023 14:13:08.3297 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: np1krP0hFV0aQRrLpf6lcYfrjnK5zHgamQoUluG3IByL8X3K4UmtRmpZvSE4s0uXcT6NPAs/mikLpX+eUph6qw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB10050 Content-Type: text/plain; charset="utf-8" Add a new helper mptcp_lib_init_ns in mptcp_lib.sh to init all namespaces ns1, ns2, ns3 and ns4. Then every test script can invoke mptcp_lib_init_ns and use all namespaces. Signed-off-by: Geliang Tang --- tools/testing/selftests/net/mptcp/diag.sh | 4 +--- .../selftests/net/mptcp/mptcp_connect.sh | 7 +------ .../testing/selftests/net/mptcp/mptcp_join.sh | 9 +-------- tools/testing/selftests/net/mptcp/mptcp_lib.sh | 18 ++++++++++++++++++ .../selftests/net/mptcp/mptcp_sockopt.sh | 6 +----- .../testing/selftests/net/mptcp/pm_netlink.sh | 4 +--- .../selftests/net/mptcp/simult_flows.sh | 6 +----- .../selftests/net/mptcp/userspace_pm.sh | 5 +---- 8 files changed, 25 insertions(+), 34 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/diag.sh b/tools/testing/self= tests/net/mptcp/diag.sh index 697afb205374..e28dce8f6f94 100755 --- a/tools/testing/selftests/net/mptcp/diag.sh +++ b/tools/testing/selftests/net/mptcp/diag.sh @@ -3,9 +3,7 @@ =20 . "$(dirname "${0}")/mptcp_lib.sh" =20 -sec=3D$(date +%s) -rndh=3D$(printf %x $sec)-$(mktemp -u XXXXXX) -ns1=3D"ns1-$rndh" +mptcp_lib_init_ns ksft_skip=3D4 TEST_COUNT=3D0 timeout_poll=3D30 diff --git a/tools/testing/selftests/net/mptcp/mptcp_connect.sh b/tools/tes= ting/selftests/net/mptcp/mptcp_connect.sh index 74a94efe85f5..91f0fb386bdd 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_connect.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_connect.sh @@ -121,12 +121,7 @@ while getopts "$optstring" option;do esac done =20 -sec=3D$(date +%s) -rndh=3D$(printf %x $sec)-$(mktemp -u XXXXXX) -ns1=3D"ns1-$rndh" -ns2=3D"ns2-$rndh" -ns3=3D"ns3-$rndh" -ns4=3D"ns4-$rndh" +mptcp_lib_init_ns =20 TEST_COUNT=3D0 TEST_GROUP=3D"" diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index 20e582d39653..e468be7becb4 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -22,8 +22,6 @@ cinsent=3D"" tmpfile=3D"" cout=3D"" capout=3D"" -ns1=3D"" -ns2=3D"" ksft_skip=3D4 iptables=3D"iptables" ip6tables=3D"ip6tables" @@ -79,12 +77,7 @@ init_partial() { capout=3D$(mktemp) =20 - local sec rndh - sec=3D$(date +%s) - rndh=3D$(printf %x $sec)-$(mktemp -u XXXXXX) - - ns1=3D"ns1-$rndh" - ns2=3D"ns2-$rndh" + mptcp_lib_init_ns =20 local netns for netns in "$ns1" "$ns2"; do diff --git a/tools/testing/selftests/net/mptcp/mptcp_lib.sh b/tools/testing= /selftests/net/mptcp/mptcp_lib.sh index 1617e1bd6785..e200eaa2047c 100644 --- a/tools/testing/selftests/net/mptcp/mptcp_lib.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_lib.sh @@ -452,3 +452,21 @@ mptcp_lib_verify_listener_events() { =20 mptcp_lib_check_expected "type" "family" "saddr" "sport" } + +rndh=3D"" +ns1=3D"" +ns2=3D"" +ns3=3D"" +ns4=3D"" + +mptcp_lib_init_ns() { + local sec + + sec=3D$(date +%s) + rndh=3D$(printf %x $sec)-$(mktemp -u XXXXXX) + + ns1=3D"ns1-$rndh" + ns2=3D"ns2-$rndh" + ns3=3D"ns3-$rndh" + ns4=3D"ns4-$rndh" +} diff --git a/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh b/tools/tes= ting/selftests/net/mptcp/mptcp_sockopt.sh index b965c12470b5..ac907bd302a6 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh @@ -14,11 +14,7 @@ timeout_test=3D$((timeout_poll * 2 + 1)) iptables=3D"iptables" ip6tables=3D"ip6tables" =20 -sec=3D$(date +%s) -rndh=3D$(printf %x $sec)-$(mktemp -u XXXXXX) -ns1=3D"ns1-$rndh" -ns2=3D"ns2-$rndh" -ns3=3D"ns3-$rndh" +mptcp_lib_init_ns =20 add_mark_rules() { diff --git a/tools/testing/selftests/net/mptcp/pm_netlink.sh b/tools/testin= g/selftests/net/mptcp/pm_netlink.sh index 853dbd2eef41..0b6e56be1207 100755 --- a/tools/testing/selftests/net/mptcp/pm_netlink.sh +++ b/tools/testing/selftests/net/mptcp/pm_netlink.sh @@ -24,9 +24,7 @@ while getopts "$optstring" option;do esac done =20 -sec=3D$(date +%s) -rndh=3D$(printf %x $sec)-$(mktemp -u XXXXXX) -ns1=3D"ns1-$rndh" +mptcp_lib_init_ns err=3D$(mktemp) =20 cleanup() diff --git a/tools/testing/selftests/net/mptcp/simult_flows.sh b/tools/test= ing/selftests/net/mptcp/simult_flows.sh index 938844477fe4..92b08750a16a 100755 --- a/tools/testing/selftests/net/mptcp/simult_flows.sh +++ b/tools/testing/selftests/net/mptcp/simult_flows.sh @@ -3,11 +3,7 @@ =20 . "$(dirname "${0}")/mptcp_lib.sh" =20 -sec=3D$(date +%s) -rndh=3D$(printf %x $sec)-$(mktemp -u XXXXXX) -ns1=3D"ns1-$rndh" -ns2=3D"ns2-$rndh" -ns3=3D"ns3-$rndh" +mptcp_lib_init_ns capture=3Dfalse ksft_skip=3D4 timeout_poll=3D30 diff --git a/tools/testing/selftests/net/mptcp/userspace_pm.sh b/tools/test= ing/selftests/net/mptcp/userspace_pm.sh index fba15905b890..263a3ac9a3ee 100755 --- a/tools/testing/selftests/net/mptcp/userspace_pm.sh +++ b/tools/testing/selftests/net/mptcp/userspace_pm.sh @@ -44,10 +44,7 @@ app6_port=3D50004 client_addr_id=3D${RANDOM:0:2} server_addr_id=3D${RANDOM:0:2} =20 -sec=3D$(date +%s) -rndh=3D$(printf %x "$sec")-$(mktemp -u XXXXXX) -ns1=3D"ns1-$rndh" -ns2=3D"ns2-$rndh" +mptcp_lib_init_ns ret=3D0 TEST_NAME=3D"" TEST_COUNT=3D0 --=20 2.35.3 From nobody Sat May 18 15:08:20 2024 Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on2084.outbound.protection.outlook.com [40.107.21.84]) (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 22A51199B1 for ; Wed, 8 Nov 2023 14:13:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=suse.com header.i=@suse.com header.b="yUrCH1WT" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XID18Cd2t4z4sn/0HCa7A9CL8JysOKqlJOP0F8+UNpMttUs2n2/Y8HpZiKKxyA06j6tOxDs/F+Dvm7Jhevo4/QoksD3mTbXDMDYIeOOO4aekT+jnlDpQbh/kXMohiXOguVtXvlw0731PRXl1pAFVAR4QcCkGAvrALHUbHBVqI5SglHQ9BVzBllJX50Hy2HA3xtr5D2ASRbcQ9M+VFYrVPV7IxzF8uHweg1YNKsGJlQno8WsM5V1RThKOt7GfDDjSFS1pZC1LPcidPe1Le+bvEJhpJwd4C4KmGNIwlIU16qddtuYHjXEgYRG7eznT1+LI3GyO8Ti3vBxXHaH5YVzl7w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=eTG/niNTY1MLHiDNHM+ZEfD/7NE6Luy3abc73BnGUEY=; b=V7lTV+ku1MS3c4TiRuIbIDW3WnUyy9pU7XsRT+/kQ4WYn+hnTvG4GnB5Sg6KcO0Mj/5CawNxt4uCx4DDEz3/QS1/hSL1XYrerJk3fYI9c4/S1leNVs3h1KWqxCPZ63uLz63qts+yQkhQY0iq4A+XlHnQyMKT9Vgc6YWKIQ1U+zYgMIwbqGEkMC7hqiEartM27Ec0qnFaWO5ns1OE1Od8/O/rKNDVgLB92n6oNZmHU+FTktF5f/JkD6VfLBsNhJZlPTLIcRem7HQg9Occy2liBbaQA7zhUl2G7pTFITZAMFp+fZ64RDyTzbw3Tc6NTNTmoUYribpb1pSHya29deUHkQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=eTG/niNTY1MLHiDNHM+ZEfD/7NE6Luy3abc73BnGUEY=; b=yUrCH1WTD+qLnEiCqpCrenB6opB3M9rpNz+mBcAyl1BAzH9G01ep0JRrzezvMpolzhUVJyZ+Bz10WjJyXRcIWYPGqcwQkbdjMs3GStvhRr11c6K17ray7m+z2qi6nvdaGOt+0iYqRmR0dZ5hW19rmf6Hey9sW2A6pQevymoFy+zvP+AjIr7N/CmkVNF1VBBJ8b5TrdTarvXaQAOYSFTnE2F6fe85zO3Ugi59LmFBTr5cPgI1s7Xicg6a1ezoHRCLTWNgqzqxHOoxJapFaB3902Pr0sgpPjbwBrJv6+SI1ZnHjsM35wjrUURucwGqHc+MVWNZdYsIIpjfCkU7nZMFVA== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) by VI1PR04MB10050.eurprd04.prod.outlook.com (2603:10a6:800:1db::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6954.19; Wed, 8 Nov 2023 14:13:17 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::7102:259:f268:5321]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::7102:259:f268:5321%6]) with mapi id 15.20.6977.011; Wed, 8 Nov 2023 14:13:17 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next 11/13] selftests: mptcp: export cin/cout/sin/sout vars Date: Wed, 8 Nov 2023 22:11:52 +0800 Message-Id: <964198a17b9e442db1918d9e22b1db771eae5fbb.1699452144.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TYAPR01CA0023.jpnprd01.prod.outlook.com (2603:1096:404::35) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: HE1PR0402MB3497:EE_|VI1PR04MB10050:EE_ X-MS-Office365-Filtering-Correlation-Id: 339c7e48-ba80-4e81-89f7-08dbe064daa1 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 5HMUjHqUYG8b4YLH9Q8QQxEKFeogi5YRcZs4eZltay/AKf+gz5jo7XF+D8W2CdyS65R3ImWX3j9bKdmHy896Bxwp8G9tbL/6zqMJyCMXrDA30a75f8FeHGCaG4QcrVlGDgQ7uXQhK4wUcV9UbYtlsRAn//dxqXd+DxizPuZXEE6qDM4KoPEyrZDLZ+vCbau7KC/luJsV7BQy/IKCK8AVWBTPRMkLKqhMBGOPJi/dBZntrGQu+62owTZaSXZfLKFTMxQstXHDJ6MCrSyxn2pLd+weIY8DSgpwQY4a8CVPMS7TazZFN4dVVCDispL49QmgEESFE+Zo2F5cLb0tBfzbhX1wWzJTb1DldraNLDSccIUxAhh+LpoJ4yH6JCeJ/TnmJqiuodRdCA1XoJEZ365jlfTiwOiLVNTTfUjEk8oTGT4jw2o+wlCy6JJdR4xtTPI0JB9TXzOP4+LB4KR9UgDsSuEUIme76cMZSzJohdcLcAvizatcDTvaGWX07y6zeWWcHC7I1h9pOa15QMB/THqIJKIVVWHdWdi+KywdMJxvGb8PxYKNMfmnnv9YbgfDT6Re X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(136003)(39850400004)(346002)(366004)(396003)(376002)(230922051799003)(186009)(1800799009)(64100799003)(451199024)(26005)(478600001)(6512007)(107886003)(6666004)(6506007)(83380400001)(4326008)(44832011)(5660300002)(66476007)(66556008)(41300700001)(6916009)(8936002)(8676002)(6486002)(316002)(66946007)(2616005)(38100700002)(2906002)(36756003)(86362001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?nbXv9iEGmST/plcMqUMyx7/l7PFWVu/cRV2cFv7bOFzmmXsKar3bykGT/bAA?= =?us-ascii?Q?qJ3oi/pUdVpwlJgyDnLoQ3YEFl7l6r7pq2YfTCBHI8f6CoQDYGQ3Kw5hvRIM?= =?us-ascii?Q?wA4zwS3ydj2sQz08A12YZtvHCBXlAyHY+GnKSVsNvauJyPYMj+MYWYmxR9BY?= =?us-ascii?Q?akJF413SbYMr3pOeUZ7qa7H/QsEK9LeGQ8OBLUAEyiVMxsJ3ujG3pvYDCyst?= =?us-ascii?Q?Zpl+rxWuK0vz2r7kZCq+dDcDGIwKwskwfUSXOSnVmcn4/+1Rh6FgJYpk5csA?= =?us-ascii?Q?0LOf1IwhFKF8+NSS5yUnFBrwU+1fgYK5xLKn6WKPVA/GVBMVd6vkhDZqF6wX?= =?us-ascii?Q?pvXXkxwbdp/BkyoOSdE9+v4KbMxzonjASRpGSfZtAUMIId+g21rHhAs0jBLo?= =?us-ascii?Q?u4rbUX8ky+QISwXt/nnfMc3Zk28QmtOka5LWTb5QY6wOgd/XujZtTXx7Ifnh?= =?us-ascii?Q?Iwy9xFwuW4vDTDYoVVt91wAqOHjn7SQczBgrjJxJXA8kOcht4eje1akbjwes?= =?us-ascii?Q?f3NgGJJ+JIAE47hA1K74kfLJ51wNFToagUxtw1eHh0e0EFmlDMFQTgegL3WZ?= =?us-ascii?Q?aPBI6Tw0eiSu/UIACoOQmUghbFOB7vcChbQy5H9krtONuSa5eHSITArdfefb?= =?us-ascii?Q?mBT4WjSdGQpYocpMHZAVg/6TnYDdytcssRDPYjY7hxDlP4xOfGYtQO1BtkWn?= =?us-ascii?Q?zosVwyubRZLGnsdpEchXRbi11nRuaL676mmqpWb18nSKdcMGL4S6rnPh5VPx?= =?us-ascii?Q?A5AheRfBbet3vzvx3LthLoi08Le+4nQawK3PduXevsFbgmdLv+UOnJ+iY4os?= =?us-ascii?Q?3TGG7TOgagmhFwVn8tbHYf71JRkWHn4R14dk2AbyNNT2zxbnVTg/dQknUCtd?= =?us-ascii?Q?jasXjLTxFVJQDZ44erbgZAIg945QJP++4uCrmS34QjeOIWy9zJ9m+k0AacXk?= =?us-ascii?Q?Efo7CReGTP99qhnsd6wV8u7nMaKnYdDMaJNHdrFamEpnAJ1JNVlIObb8UXRz?= =?us-ascii?Q?xtXlZmNRVbzKTCYv8Cn9rU/MkyTiah/neHKTfy32cNiE3c8DhDoWBd6He4/V?= =?us-ascii?Q?uVrLo9FxchwLmpEXQnepU8mur9tOarRCLufbNlBizzd52di1EiNMDFfeA2Ln?= =?us-ascii?Q?RVEJjy30WzpcHPQxBG2XxBVQbKvphn237AtNCjnN16Mfzddj80Muqsu+G/7Y?= =?us-ascii?Q?rK5iLpH90yBL8O5lvEBedFjZY1xtJ4dy9wZSqwmsb44DpnOsXdy+IrPx8eA1?= =?us-ascii?Q?iwRGJrJvs7pSboYhjnOHOgCq0/dJm8J+Tnu8n4qH4AL0hzepcovrTZsh4EH2?= =?us-ascii?Q?/UNBb5KmxO60/xMKg1xiU0c7FFoPHBMtnepe6+pGPbGGoCz3/WG4qD8/gt7b?= =?us-ascii?Q?yK8g1gCil9jXO9bgJWdyWZ0VYNZFz2m2JZgOfOxrOzkUCHKtSCGJgQ6hb1UY?= =?us-ascii?Q?V6aBlEaFHb3M/M1qeEu1LzFdaMOrHQuQP4V/Uwfwb26VYqrdLWf5nRidFxB/?= =?us-ascii?Q?RoOLd3hQtZ6+yAJecfHraBdXHLWd2KIrDbvydWNyP0u8RCmG6YBAJH3ykrOP?= =?us-ascii?Q?bcDfo/PHubqUoIpXlKvQsZsEARwolT7xYEwfFejw?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 339c7e48-ba80-4e81-89f7-08dbe064daa1 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Nov 2023 14:13:17.6441 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 8xkZK1NfReX0GlyAdepjmEJjyOgZjqmfBNDnQflEuzvzLLtEVP3tDl2JpHiuSp2b4Ho3fBIqwBfIdN3mcX3/EQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB10050 Content-Type: text/plain; charset="utf-8" Export cin, cout, sin and sout vars into mptcp_lib.sh as public vars. Then they can be used in all test script unified. Signed-off-by: Geliang Tang --- tools/testing/selftests/net/mptcp/mptcp_connect.sh | 8 -------- tools/testing/selftests/net/mptcp/mptcp_join.sh | 8 -------- tools/testing/selftests/net/mptcp/mptcp_lib.sh | 5 +++++ tools/testing/selftests/net/mptcp/mptcp_sockopt.sh | 8 -------- tools/testing/selftests/net/mptcp/simult_flows.sh | 2 -- 5 files changed, 5 insertions(+), 26 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_connect.sh b/tools/tes= ting/selftests/net/mptcp/mptcp_connect.sh index 91f0fb386bdd..da932176c85d 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_connect.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_connect.sh @@ -8,11 +8,7 @@ time_start=3D$(date +%s) optstring=3D"S:R:d:e:l:r:h4cm:f:tC" ret=3D0 final_ret=3D0 -sin=3D"" -sout=3D"" cin_disconnect=3D"" -cin=3D"" -cout=3D"" ksft_skip=3D4 capture=3Dfalse timeout_poll=3D30 @@ -149,10 +145,6 @@ if [ $? -ne 0 ];then exit $ksft_skip fi =20 -sin=3D$(mktemp) -sout=3D$(mktemp) -cin=3D$(mktemp) -cout=3D$(mktemp) capout=3D$(mktemp) cin_disconnect=3D"$cin".disconnect cout_disconnect=3D"$cout".disconnect diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index e468be7becb4..4aac1bce8aec 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -13,14 +13,10 @@ . "$(dirname "${0}")/mptcp_lib.sh" =20 ret=3D0 -sin=3D"" sinfail=3D"" -sout=3D"" -cin=3D"" cinfail=3D"" cinsent=3D"" tmpfile=3D"" -cout=3D"" capout=3D"" ksft_skip=3D4 iptables=3D"iptables" @@ -166,11 +162,7 @@ init() { =20 check_tools =20 - sin=3D$(mktemp) - sout=3D$(mktemp) - cin=3D$(mktemp) cinsent=3D$(mktemp) - cout=3D$(mktemp) mptcp_lib_evts_init =20 trap cleanup EXIT diff --git a/tools/testing/selftests/net/mptcp/mptcp_lib.sh b/tools/testing= /selftests/net/mptcp/mptcp_lib.sh index e200eaa2047c..53e69fc807a6 100644 --- a/tools/testing/selftests/net/mptcp/mptcp_lib.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_lib.sh @@ -17,6 +17,11 @@ readonly AF_INET6=3D10 =20 MPTCP_LIB_SUBTESTS=3D() =20 +sin=3D$(mktemp) +sout=3D$(mktemp) +cin=3D$(mktemp) +cout=3D$(mktemp) + # only if supported (or forced) and not disabled, see no-color.org if { [ -t 1 ] || [ "${SELFTESTS_MPTCP_LIB_COLOR_FORCE:-}" =3D "1" ]; } && [ "${NO_COLOR:-}" !=3D "1" ]; then diff --git a/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh b/tools/tes= ting/selftests/net/mptcp/mptcp_sockopt.sh index ac907bd302a6..780ceb9314b9 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh @@ -4,10 +4,6 @@ . "$(dirname "${0}")/mptcp_lib.sh" =20 ret=3D0 -sin=3D"" -sout=3D"" -cin=3D"" -cout=3D"" ksft_skip=3D4 timeout_poll=3D30 timeout_test=3D$((timeout_poll * 2 + 1)) @@ -336,10 +332,6 @@ do_tcpinq_tests() return $? } =20 -sin=3D$(mktemp) -sout=3D$(mktemp) -cin=3D$(mktemp) -cout=3D$(mktemp) init make_file "$cin" "client" 1 make_file "$sin" "server" 1 diff --git a/tools/testing/selftests/net/mptcp/simult_flows.sh b/tools/test= ing/selftests/net/mptcp/simult_flows.sh index 92b08750a16a..0a06b7f41650 100755 --- a/tools/testing/selftests/net/mptcp/simult_flows.sh +++ b/tools/testing/selftests/net/mptcp/simult_flows.sh @@ -50,8 +50,6 @@ setup() { large=3D$(mktemp) small=3D$(mktemp) - sout=3D$(mktemp) - cout=3D$(mktemp) capout=3D$(mktemp) size=3D$((2 * 2048 * 4096)) =20 --=20 2.35.3 From nobody Sat May 18 15:08:20 2024 Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on2045.outbound.protection.outlook.com [40.107.21.45]) (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 75CFF199B1 for ; Wed, 8 Nov 2023 14:13:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=suse.com header.i=@suse.com header.b="DGHbvOhl" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=htCm78jGTAWkeq7G7NTR/0755v/6oeYBElG4iHXk5DrKZoQnVLtIEgVcnPRYfGvxcVf2hcdk9eih61B55TIR3CuqY35nBRgQbTDqyTe/TDdOdga2jrlJRw+xUsTG8WA4J4gAsBqq8fJlVY8jLQM/LS2LnTS1ukw4C6AacXlcBkYGtjzxLOeCA2Rzh0PIU/29tn/vLBuWt/2K3elU6rH3wwvTCntlcuQiQ3J/VHwro7/2uroJXdzCd9x23qfzxPSXchQOoovbs6JYUegu0wioZgHBaKSzvI5xJjLto3VLSzaUVL25HB/rDHIQC2ZMbKe/3TDQf5QMdmsyuAJkdHeB/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=ZTQT+L5Fka8DjEHUuapA0LSN3x6d6tZJcQj7UP8IGH0=; b=B59CkiRVUH2HtDTXFtdWpbGQAnePWmOpZrN6+C6Ff/plC/pRFsNgqjGwzsiHsWqusnrR2FUS87ZvQF2g6xe7aGpc889sbxkOuMIpvjKP5yF3sHQ8w/sTg8R9kv3gOegUCtd2NGMmBSUdZiiDzDKTjdlygpSpHvbtESEMpnWYAXUi4LZSzNeCP3f0IK2VvCUiBIZLjzZOiy3vNIB2iItQEWKV/FjRQmmd8MVhKHthM5za8KWlf9Pi3vTJj94Z71xDEFPB6WT9GBuf9m6vEEg1Nd+QPhvm0tWKXBL+NmcgWgbcs68EMUKO1wwrMqKDUuGmcfAQv3geZIgOIhYNBLWGZA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ZTQT+L5Fka8DjEHUuapA0LSN3x6d6tZJcQj7UP8IGH0=; b=DGHbvOhlWGDhcu9741nQHjTTRI5JkIBIGs88iPXq2zkoV+nWqzxoixoZuSgxp6YtPS8+t9hR04cfKCkf0H2T5FS7sSsRK6K+CPfL+4cEdKNT5XESk5e/RAvzDZ4V2RHtj5vsgY6qS0NA2y0Ep1SGdpJlmdQlhYlbq3wNi7lk6D+y68UkNZu5vFcNiAWyVUFhXjXbXVaSg8Up7JDu6FYFYi5wuF/BS0J1Uy3kGxGSKQe0tvxItp7dCPWJWj7K54zkXXGWFKawUWjC4sqUDfX+nhujcq0HbtX0UQD3m/mer+xq/0RWzOkV4Z0QCO2YOISdrdXO0Rgntdqqc1szXj28YQ== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) by VI1PR04MB10050.eurprd04.prod.outlook.com (2603:10a6:800:1db::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6954.19; Wed, 8 Nov 2023 14:13:27 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::7102:259:f268:5321]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::7102:259:f268:5321%6]) with mapi id 15.20.6977.011; Wed, 8 Nov 2023 14:13:27 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next 12/13] selftests: mptcp: export more vars into mptcp_lib Date: Wed, 8 Nov 2023 22:11:53 +0800 Message-Id: <7f579f7b04d9433dfdab7dc568a014cc5f0f905f.1699452144.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TYCP286CA0176.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:3c6::8) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: HE1PR0402MB3497:EE_|VI1PR04MB10050:EE_ X-MS-Office365-Filtering-Correlation-Id: 3f31fd57-610f-46bb-dd43-08dbe064e08d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 0p20aZaXq1rCnTougLJ/06M/aQYz/1zcuaMTvUqSfQQoK3nUG0wJxtgBtWB7P6J7BNU8/9LyZMmPCFQJ82n4Xyj8pI6ozQCPcCnS237tUGFh0N/AJB0mzNTKViuTDgx5mUCyMrVRL/1nClnMwCK6baMGc1hYEMsWbfIq/iQivl4xQxO1Pkj5p1CarY/ydbW88e91+DpxW97aWlsevNF9swTVCLNaWaSrTljDpl/d9BHufUWBL6zfGivPMkR8olrfQrXmyJuNvpm0ZyynsTfa4QWNhuWaw29ijcLorxosy7q4BOocSjfnlKg61xUbdfHYCkwXtWz0jXRcCdsf+fvEPWiuJRhvnTtc9dGdA3ruJ4k/hfiHvrONffkHDlwusiloTepB2hkf7W9Jnfmc4B+JCvGmteuIBKRdDWsT7cexyepweTOAzIC3h0+tGDCdav0bvrUou/gx9FUYufN3oUSBrJmDuqkNgQjz3TUcC5nlQ/HBRJp+sJMRl6OF6xI9hX1vfT99ljIa1iTEveKRHO/TcOe1gTQEeP3X+A5m472Am0b/Q68x6Q3FJWPDwlyCc5N7 X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(136003)(39850400004)(346002)(366004)(396003)(376002)(230922051799003)(186009)(1800799009)(64100799003)(451199024)(26005)(478600001)(6512007)(107886003)(6666004)(6506007)(83380400001)(4326008)(44832011)(5660300002)(66476007)(66556008)(41300700001)(6916009)(8936002)(8676002)(6486002)(316002)(66946007)(2616005)(38100700002)(2906002)(36756003)(86362001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?8YStbDOF6r5fr5MrmcfygZxiJqZlrzZAIr+w3kVMs2O9G93vqjcLxl3rN7ph?= =?us-ascii?Q?W64YGKMcCrJbUpGcsG3SL/zEE8Xp29bGyYQwg8kOkcU+Ao9/lZPXhWhkEbfU?= =?us-ascii?Q?hYYn2gurDGTK99Klr5N1Ee5X8xLPzYKlFdCTyv3IhZt8CJfl3V3eU7NIa3Us?= =?us-ascii?Q?/RLaqIwXOE3CmwAJu7V4GIQhvTs9PswRW69wk5TPZSlA4lIxLCzJb1zSmJAk?= =?us-ascii?Q?LmwAXdVj+oBs3OBSkOaTVyE4ZsqGZ4V3/rizCd4u2PbDY1YEjybFmqcu/SXn?= =?us-ascii?Q?5tgr155z09AU1hJhswhdAZw9/Cnt7E2zcmneSdUvv7/rgdf5RwPcHPRwUtnr?= =?us-ascii?Q?RtftU393M2JNn68+q1PiRhPv1YoaJUNMAm72cRg6GU1GwFQftq6FqtVH7Nzq?= =?us-ascii?Q?DKQXH+d6vN5VJous0L3VMhvzVq+n5LHoA/u11XgNMUpoMXe53CnReNjGh5w7?= =?us-ascii?Q?zVt6Fn7GJnKod8UJebktx8tvRmBpRYhsiEUWmleAWrv6FTSwA1OyBp/11SHX?= =?us-ascii?Q?al9yUiXITLpImNWoXmmlml8Lipz6KqtRhIGvtSKfapd64khvOOuQkkXt5938?= =?us-ascii?Q?Jq9D2i+HrYvfOXz/0QPFgVI8GEQzxPy8jtQ5zG+S19J6kDP9SJ1gkZDRy+YK?= =?us-ascii?Q?6LhbSM0caDc8SAhbLFW+J7y1qFLllErnueMIeYP6G7NwymtFEoSbbqziBVEL?= =?us-ascii?Q?BUADK0DK2h7zk6QrIwELL6XNlOnueS4cDEohvkW8EIm+w2mZGwTKtqrh9vl1?= =?us-ascii?Q?rWTjfhxmbv6xGc09xd7pmYNN1PeimCyl+1YK7L9p3m/pgz53EjakAjBPnNms?= =?us-ascii?Q?87iS9IbFlui/uLi26DOhEDc0V9fQvGmVpociwLnm8OYTho0Gxjg8v/xw1w+A?= =?us-ascii?Q?YwXo4JApbHgKSt9pYZcHib+HpztKzwpgdpoTkMfduW/sWKErzxobRUflGlsd?= =?us-ascii?Q?HuTbJCd/CxuJcLOW+cXWEqYCR1NaxE5mijMRe5rpwyGUeRxEDSQhQiy+YPb/?= =?us-ascii?Q?uxC+feTgdCsawafXkvjO+bO7/1O1ov8Q3HGy7SN1ILoaZ3fAj+nOhrNIYBLl?= =?us-ascii?Q?FXxrrdLOQ/1RjRNzbij/kiHIQimuTxfosN7NXYlmkGKX5aNF93qoutSrXh7v?= =?us-ascii?Q?qhCWtg4NJ779IcHuy3xvrsNZ+ibbfq0jQeNgfHPFxVP1mx/inKUkjDuXymoS?= =?us-ascii?Q?ECjyHVP/p4VCOeL9ID9rigF5OaJnE10K5rhVZDXxhWMTLRtq+46djHR1gcBW?= =?us-ascii?Q?o/qV3dCBRB8tovtZOuMzLtLk/oY4MWkomEWAawHM8vg1q+N6bdy5cBZPlbjh?= =?us-ascii?Q?T4VPHcwXfwSVly9mdyDkzQYv8LTgMTHA0niFGgTZ8H0PDzoaWd+Y6LVbiuiK?= =?us-ascii?Q?yWM2as88sWmuLF9L70yfQReoOM3K7sN/7aR6YwUfHeWiLq8KSEEWcVYWjc01?= =?us-ascii?Q?WvTLlkRNAx3kpoy9bxKalaZPyh/015imy9zfjhC6OVd5COTUOclNzvYUkLsk?= =?us-ascii?Q?J2UAFr/4rspBHC0cSpYwj4sOSQnoGU8kjWs9IaAmNFJYWCdV67ALKKmRusYp?= =?us-ascii?Q?r4TokQnEe8+ZGwzC9k6Mp2J9Wsi7cLisG6Ey3qO/?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3f31fd57-610f-46bb-dd43-08dbe064e08d X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Nov 2023 14:13:27.6268 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: DxikA/cdQP7G1Z4Oq5ORUPBh3uTiNbXh+UfUf/mvzRSDzbJaA2IMgtyRzTn0042VRjN1CVf1qjbA5Pb7NGhLxA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB10050 Content-Type: text/plain; charset="utf-8" Move the variables 'TEST_NAME' and 'TEST_COUNT', 'ret', 'capture' and 'checksum', 'timeout_poll' and 'timeout_test', 'iptables' and 'ip6tables' into mptcp_lib.sh as public variables. Signed-off-by: Geliang Tang --- tools/testing/selftests/net/mptcp/diag.sh | 4 ---- tools/testing/selftests/net/mptcp/mptcp_connect.sh | 6 ------ tools/testing/selftests/net/mptcp/mptcp_join.sh | 9 --------- tools/testing/selftests/net/mptcp/mptcp_lib.sh | 14 ++++++++++++++ tools/testing/selftests/net/mptcp/mptcp_sockopt.sh | 5 ----- tools/testing/selftests/net/mptcp/pm_netlink.sh | 1 - tools/testing/selftests/net/mptcp/simult_flows.sh | 5 ----- tools/testing/selftests/net/mptcp/userspace_pm.sh | 3 --- 8 files changed, 14 insertions(+), 33 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/diag.sh b/tools/testing/self= tests/net/mptcp/diag.sh index e28dce8f6f94..6c5f84f59898 100755 --- a/tools/testing/selftests/net/mptcp/diag.sh +++ b/tools/testing/selftests/net/mptcp/diag.sh @@ -5,10 +5,6 @@ =20 mptcp_lib_init_ns ksft_skip=3D4 -TEST_COUNT=3D0 -timeout_poll=3D30 -timeout_test=3D$((timeout_poll * 2 + 1)) -ret=3D0 =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 da932176c85d..a926493a349e 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_connect.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_connect.sh @@ -6,13 +6,9 @@ time_start=3D$(date +%s) =20 optstring=3D"S:R:d:e:l:r:h4cm:f:tC" -ret=3D0 final_ret=3D0 cin_disconnect=3D"" ksft_skip=3D4 -capture=3Dfalse -timeout_poll=3D30 -timeout_test=3D$((timeout_poll * 2 + 1)) ipv6=3Dtrue ethtool_random_on=3Dtrue tc_delay=3D"$((RANDOM%50))" @@ -22,7 +18,6 @@ sndbuf=3D0 rcvbuf=3D0 options_log=3Dtrue do_tcp=3D0 -checksum=3Dfalse filesize=3D0 connect_per_transfer=3D1 =20 @@ -119,7 +114,6 @@ done =20 mptcp_lib_init_ns =20 -TEST_COUNT=3D0 TEST_GROUP=3D"" =20 cleanup() diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index 4aac1bce8aec..f11d47354937 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -12,19 +12,12 @@ =20 . "$(dirname "${0}")/mptcp_lib.sh" =20 -ret=3D0 sinfail=3D"" cinfail=3D"" cinsent=3D"" tmpfile=3D"" capout=3D"" ksft_skip=3D4 -iptables=3D"iptables" -ip6tables=3D"ip6tables" -timeout_poll=3D30 -timeout_test=3D$((timeout_poll * 2 + 1)) -capture=3Dfalse -checksum=3Dfalse ip_mptcp=3D0 check_invert=3D0 validate_checksum=3Dfalse @@ -37,8 +30,6 @@ declare -A all_tests declare -a only_tests_ids declare -a only_tests_names declare -A failed_tests -TEST_COUNT=3D0 -TEST_NAME=3D"" nr_blank=3D6 =20 # These var are used only in some tests, make sure they are not already set diff --git a/tools/testing/selftests/net/mptcp/mptcp_lib.sh b/tools/testing= /selftests/net/mptcp/mptcp_lib.sh index 53e69fc807a6..ae394d5e1735 100644 --- a/tools/testing/selftests/net/mptcp/mptcp_lib.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_lib.sh @@ -17,6 +17,20 @@ readonly AF_INET6=3D10 =20 MPTCP_LIB_SUBTESTS=3D() =20 +TEST_NAME=3D"" +TEST_COUNT=3D0 + +ret=3D0 + +capture=3Dfalse +checksum=3Dfalse + +readonly timeout_poll=3D30 +timeout_test=3D$((timeout_poll * 2 + 1)) + +iptables=3D"iptables" +ip6tables=3D"ip6tables" + sin=3D$(mktemp) sout=3D$(mktemp) cin=3D$(mktemp) diff --git a/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh b/tools/tes= ting/selftests/net/mptcp/mptcp_sockopt.sh index 780ceb9314b9..019d4dc91d70 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh @@ -3,12 +3,7 @@ =20 . "$(dirname "${0}")/mptcp_lib.sh" =20 -ret=3D0 ksft_skip=3D4 -timeout_poll=3D30 -timeout_test=3D$((timeout_poll * 2 + 1)) -iptables=3D"iptables" -ip6tables=3D"ip6tables" =20 mptcp_lib_init_ns =20 diff --git a/tools/testing/selftests/net/mptcp/pm_netlink.sh b/tools/testin= g/selftests/net/mptcp/pm_netlink.sh index 0b6e56be1207..208669f474cf 100755 --- a/tools/testing/selftests/net/mptcp/pm_netlink.sh +++ b/tools/testing/selftests/net/mptcp/pm_netlink.sh @@ -4,7 +4,6 @@ . "$(dirname "${0}")/mptcp_lib.sh" =20 ksft_skip=3D4 -ret=3D0 =20 usage() { echo "Usage: $0 [ -h ]" diff --git a/tools/testing/selftests/net/mptcp/simult_flows.sh b/tools/test= ing/selftests/net/mptcp/simult_flows.sh index 0a06b7f41650..ad589c7699a1 100755 --- a/tools/testing/selftests/net/mptcp/simult_flows.sh +++ b/tools/testing/selftests/net/mptcp/simult_flows.sh @@ -4,12 +4,7 @@ . "$(dirname "${0}")/mptcp_lib.sh" =20 mptcp_lib_init_ns -capture=3Dfalse ksft_skip=3D4 -timeout_poll=3D30 -timeout_test=3D$((timeout_poll * 2 + 1)) -TEST_COUNT=3D0 -ret=3D0 bail=3D0 slack=3D50 =20 diff --git a/tools/testing/selftests/net/mptcp/userspace_pm.sh b/tools/test= ing/selftests/net/mptcp/userspace_pm.sh index 263a3ac9a3ee..021d570df234 100755 --- a/tools/testing/selftests/net/mptcp/userspace_pm.sh +++ b/tools/testing/selftests/net/mptcp/userspace_pm.sh @@ -45,9 +45,6 @@ client_addr_id=3D${RANDOM:0:2} server_addr_id=3D${RANDOM:0:2} =20 mptcp_lib_init_ns -ret=3D0 -TEST_NAME=3D"" -TEST_COUNT=3D0 =20 _printf() { stdbuf -o0 -e0 printf "${@}" --=20 2.35.3 From nobody Sat May 18 15:08:20 2024 Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04on2075.outbound.protection.outlook.com [40.107.8.75]) (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 BC0F9199B1 for ; Wed, 8 Nov 2023 14:13:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=suse.com header.i=@suse.com header.b="gueB4ETQ" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=j8na4aRm6BydmcOXi+AUnwoDxhHbB0BUj03YAZ81j1eYdytCRkAkAKfTiwzgDkMismWx1pvzpzfXMiSb2ogyfCHgC7mMScNWQEyiZpzAOibVJWY4ppAo2q+R4bI+ogaovblDUNHQR7dDZc18Kj8pHV+bCAap9V42JAcxZwINgYZszgCNBmklJoMVUPFwEIfNs8gi/cYdZz3rsFyMOm9rmwPSe+3NA1O4fzgxN2Se3slvyytR7XCAPYCYvF6BSL1OXYish2NKHtIumYgcvS8DuE2mTvhLhl/kqpTngUyYEVrtWjxWBIyfQlWhtegcWir6M5X85pss7ydtET9Z2q+ntg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=odhziH72U41NDBeqalHy40ct/6j3yV3EErhsHwPLBr0=; b=dmVoIZiRNcm7877M/QVrUvRL7wHq0/e+xnnjOfxYWax8n7GTkJInjg7vUQ08xYDGhTAhemSAAA6Qph9N4Df8bgJWV4WVRy0vld56ONnoaWr207UJlxG2C675ZFT0tDWhVpTVNC7HHs1+9MvB3iL8YzSosHb7saiZP+7R54MI7DlHMybsTOGUMFuIGwt9ylAmQafwqxwoVumnEfDDPRUP4qkYoZRqjkpcScl1f0/n6rVSa6nzo7kwk1KXwhY8vJuBx4pFwBLPrVyiAcAB+L1jglkO/2Jc9+Ny5nXe0+qSC2+a6vZ+wywoMCLOBBNIEpoKSCMPnU0Tm6lJ5Y+ceyG2VA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=odhziH72U41NDBeqalHy40ct/6j3yV3EErhsHwPLBr0=; b=gueB4ETQZ/N/imnbLO5UpzGQyCHx4WVEeCNAHwXLcaUSWZBfvUUd0J6juZXLhTZigsMWXdBiyAC9uwiy7MF6V/5CTZTH8dHFA6ZX7eV2vyytSAtI8rpUHIFCYaUDYGdqJEvh6/H8BwURf0EF3idEGDUhqTfAtFVLeSpW1YpwwiHg8yPtEPYb2tbImmwWRRUwqNOAX0L/CaSOj9EIhZLqFWN2+VESEmea5rdkAWRQdJdcUyh9VZdUgj9pv/5RrOcJ81028rYivwV+Ex/6DDhJNTEB80VTOcyeWn7LzmOhEQgExw/0duO+Y5//7nF6brbL+qNpt+zpOaRo/ZKlPMoyeQ== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) by VI1PR04MB10050.eurprd04.prod.outlook.com (2603:10a6:800:1db::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6954.19; Wed, 8 Nov 2023 14:13:36 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::7102:259:f268:5321]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::7102:259:f268:5321%6]) with mapi id 15.20.6977.011; Wed, 8 Nov 2023 14:13:36 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next 13/13] selftests: mptcp: use KSFT_SKIP instead ksft_skip Date: Wed, 8 Nov 2023 22:11:54 +0800 Message-Id: <0c440fc3867b134f0dfa76c347d7c0c8bab0d8ae.1699452144.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TYCP286CA0072.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:31a::20) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: HE1PR0402MB3497:EE_|VI1PR04MB10050:EE_ X-MS-Office365-Filtering-Correlation-Id: 1c6ecdfb-d4ae-4a8f-d2c8-08dbe064e61a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: joZNA0JDJij2qFBZVkU+301Oc6c23GS9LQ6urX/ktRw7l0WryjjAIJDZbOWhO3SUEE7BXZC8Pa5xnw8m21N4RcHQiXUdoLVkcU6iVLDIvTxQB1Q0aHYhw3N1p2B7LhwcczM5FzzXi2uIzx6Dbi/KzRNQnh/JGptQJVpqdJukF00nAClq90B7kDFdhOOr3ky/BMqH1RroMTHnJUqm40ecWPyJwSbMePCRLFqot3qhSUJF/93Tesx36PGlzcrn77XyX+dU7wLtidPy3GEp2epPOLdhDgc85QDpfDYT3Aiksg0JhVRK+M7+UoWs86I4u9wSWoQN/hKvQDtx6YBBtAb93cftZUmFpdzE953j5kq8zbJEsFm9aI5eviYvYJHAuGhJJKGNLbAIVE9fs3o34UJCqB8iKoUw6NrWwnj/AD8T2BEKVNu6fSQAbIK41Y6TzK2INwOYksKlapYTgdreF6QBrtpNdMadvgpc42FfwxvcJ8d6Tn2HqigtRtlYI/hhUZeX2+CJb2GpfQUybSFvTam2RiwawCbOGd2jNG2arACaPvBEsLN+dYxgoiTRE3ckGUiC X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(136003)(39850400004)(346002)(366004)(396003)(376002)(230922051799003)(186009)(1800799009)(64100799003)(451199024)(26005)(478600001)(6512007)(107886003)(6666004)(6506007)(83380400001)(4326008)(44832011)(5660300002)(66476007)(66556008)(41300700001)(6916009)(8936002)(8676002)(6486002)(316002)(66946007)(2616005)(38100700002)(2906002)(36756003)(86362001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?YewPjdDT+XSMZnKsEuvcKGlx+CahsVLb14FIHyu4frl1ojcUZKFIBTiBNEKE?= =?us-ascii?Q?z4k0fdIKtU4egUQdcIdYIKNT3urK9Yx8kuOQ8QXMQGoPKyL79OYKnjJR4lyO?= =?us-ascii?Q?BX1JpelMCkUNl63C61rMJ0S4LOD3koUdpEvSJFfHR92LaOxC8USqhpEItmpk?= =?us-ascii?Q?o35m7A1UU9o4qcDDJjgFjPX85747Ox3PSwJS0glFFtBn9rBDIKxGcYdrSa9A?= =?us-ascii?Q?sA21KVGQQtpUFfls2XqVfrJJ0H3AP8kHaMloHZx7jCRMbarEuJ8eK7yS2p2I?= =?us-ascii?Q?5PAneg4weu22cnesBrL8ceQ1qDPhTZvvWaPoC0H4FtG0BEvaVI+2i7SXpLV6?= =?us-ascii?Q?+VMKB7xMtLeL+cEWlqpBrZoLxgCjDr6uYsfw8JVU8/Krag6svCDsaJ23+kxz?= =?us-ascii?Q?t/mBt9lRmG9vSsEXZd4nrBCjF89RMQn4ByQ3xqQgMfm7GXJjN4qgR7gh0fzO?= =?us-ascii?Q?4ct53pEO24L+JUh4PAIqkYScmQnF2beXs72i4bsib65Cij+ENLKinSyajTir?= =?us-ascii?Q?Y3rqV+JWHVho7HZhTjsUKmarW783+isw9vlhC+UCJQoGFY+6BrMsAsXUqFD1?= =?us-ascii?Q?Yt9wifvvNDd9bONfZJxYFXbgDIFtzRyjZ6wGXUXCuSqQzi9dc+g0vDwORUFx?= =?us-ascii?Q?TYux8Ud9UGbBsT2KpjY4ODKPGEDe8Js1b4qrdyoTUa2eqT8DXyYQTaTgXP7e?= =?us-ascii?Q?J5hyl1FO0OUnk2wXTjGuwOEm9gugTR+5MUsJZKXZu8DyqK4p/8rTOHPbgPo9?= =?us-ascii?Q?l+Fl82F3npD4BHa+HdErEApBB2/uMMHH5lfoMcDk+x354yJx6QrLIZgpcyEf?= =?us-ascii?Q?RiKiHJZjXCJwOxJ6k3nJhCynpW80w1LAcDy8lPkqE8rNw1ziDBM2qM+tBW1d?= =?us-ascii?Q?/kvbmHOdHnrN9IsCg7c4pbLoWsxMXs5AMqQaAnFigRiznMHKmHVKLEL4dGw+?= =?us-ascii?Q?AVt0fxa+dzTFIMZlddsHAiorrSHxaun0zieAULjz9bAVi8cbbInXu6CR9YYs?= =?us-ascii?Q?h+AzOlBlXVNVNJ/Y0Z0I93cQAMvNlKlhD0JxeBQTfQL2L/qV/ad4g6Lm7WVD?= =?us-ascii?Q?YZUJp128e9oyVsYr2hMkrdtk8M1r6iS5Kro+CMN7qz2eoEXxJ03fklRWJFm+?= =?us-ascii?Q?kgvD76gCr/K++Aizp8eIuAQ+NqXETsv9Op23XW8vBkMSDLbQnyawpak38AfG?= =?us-ascii?Q?VDVuQ0Mx+9nJLG6d6NN+v+S4iZba5pPxToNNJiS6tJU+j1DLnFyPdu2wtUw8?= =?us-ascii?Q?pJL0CPyN34KRsUu6vjdzcZ+chdcZVZqoIpAQ2tq/dZH+7ox8TYO4i4uma87E?= =?us-ascii?Q?M24+75F30jULJeQf+7+wH1tBCuM4UN7uAzian/h2U0TrqCLP7IpFMLGUSwjC?= =?us-ascii?Q?llAetnV8tfnwcQ9VkERBH7Nq4mK1XAPvUXb1dG0GiiIiwDqzyzbP+lV0kBkg?= =?us-ascii?Q?PVj7C2RYAVP4m4/t3L054Fyx/7e0vS3pBrxRmiv1HNZe11zIXs5Is4aWs93r?= =?us-ascii?Q?5oNCrVsK8A6ScPSN9EN5d7mu3cOx7pFGPLxDFIXfhw5p9xD20R6mqlx/ANvV?= =?us-ascii?Q?Y+ISOHH6+loV6J0A5tTmRZj+4K8KSjNL20RB8fqp?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1c6ecdfb-d4ae-4a8f-d2c8-08dbe064e61a X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Nov 2023 14:13:36.8147 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: cm4ZHjvpRvwpkSflASBm2rHoGAtdOefAv89y4pDFFhDGGliPETAABHC6qn8Ed6n1TmYb2tAsjsKo5ORCjnR+0Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB10050 Content-Type: text/plain; charset="utf-8" This patch uses the public var KSFT_SKIP in mptcp_lib.sh instead of ksft_skip, and drop every 'ksft_skip=3D4'. Signed-off-by: Geliang Tang --- tools/testing/selftests/net/mptcp/diag.sh | 5 ++--- .../selftests/net/mptcp/mptcp_connect.sh | 7 +++---- tools/testing/selftests/net/mptcp/mptcp_join.sh | 17 ++++++++--------- .../selftests/net/mptcp/mptcp_sockopt.sh | 10 ++++------ tools/testing/selftests/net/mptcp/pm_netlink.sh | 6 ++---- .../testing/selftests/net/mptcp/simult_flows.sh | 5 ++--- 6 files changed, 21 insertions(+), 29 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/diag.sh b/tools/testing/self= tests/net/mptcp/diag.sh index 6c5f84f59898..c114434954ae 100755 --- a/tools/testing/selftests/net/mptcp/diag.sh +++ b/tools/testing/selftests/net/mptcp/diag.sh @@ -4,7 +4,6 @@ . "$(dirname "${0}")/mptcp_lib.sh" =20 mptcp_lib_init_ns -ksft_skip=3D4 =20 flush_pids() { @@ -32,12 +31,12 @@ mptcp_lib_check_mptcp ip -Version > /dev/null 2>&1 if [ $? -ne 0 ];then echo "SKIP: Could not run test without ip tool" - exit $ksft_skip + exit ${KSFT_SKIP} fi ss -h | grep -q MPTCP if [ $? -ne 0 ];then echo "SKIP: ss tool does not support MPTCP" - exit $ksft_skip + exit ${KSFT_SKIP} fi =20 get_msk_inuse() diff --git a/tools/testing/selftests/net/mptcp/mptcp_connect.sh b/tools/tes= ting/selftests/net/mptcp/mptcp_connect.sh index a926493a349e..e41f96254f84 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_connect.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_connect.sh @@ -8,7 +8,6 @@ time_start=3D$(date +%s) optstring=3D"S:R:d:e:l:r:h4cm:f:tC" final_ret=3D0 cin_disconnect=3D"" -ksft_skip=3D4 ipv6=3Dtrue ethtool_random_on=3Dtrue tc_delay=3D"$((RANDOM%50))" @@ -136,7 +135,7 @@ mptcp_lib_check_kallsyms ip -Version > /dev/null 2>&1 if [ $? -ne 0 ];then echo "SKIP: Could not run test without ip tool" - exit $ksft_skip + exit ${KSFT_SKIP} fi =20 capout=3D$(mktemp) @@ -145,7 +144,7 @@ cout_disconnect=3D"$cout".disconnect trap cleanup EXIT =20 for i in "$ns1" "$ns2" "$ns3" "$ns4";do - ip netns add $i || exit $ksft_skip + ip netns add $i || exit ${KSFT_SKIP} ip -net $i link set lo up done =20 @@ -238,7 +237,7 @@ fi check_mptcp_disabled() { local disabled_ns=3D"ns_disabled-$rndh" - ip netns add ${disabled_ns} || exit $ksft_skip + ip netns add ${disabled_ns} || exit ${KSFT_SKIP} =20 # net.mptcp.enabled should be enabled by default if [ "$(ip netns exec ${disabled_ns} sysctl net.mptcp.enabled | awk '{ pr= int $3 }')" -ne 1 ]; then diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index f11d47354937..3dfe20b00220 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -17,7 +17,6 @@ cinfail=3D"" cinsent=3D"" tmpfile=3D"" capout=3D"" -ksft_skip=3D4 ip_mptcp=3D0 check_invert=3D0 validate_checksum=3Dfalse @@ -68,7 +67,7 @@ init_partial() =20 local netns for netns in "$ns1" "$ns2"; do - ip netns add $netns || exit $ksft_skip + ip netns add $netns || exit ${KSFT_SKIP} ip -net $netns link set lo up ip netns exec $netns sysctl -q net.mptcp.enabled=3D1 ip netns exec $netns sysctl -q net.mptcp.pm_type=3D0 2>/dev/null || true @@ -132,7 +131,7 @@ check_tools() =20 if ! ip -Version &> /dev/null; then echo "SKIP: Could not run test without ip tool" - exit $ksft_skip + exit ${KSFT_SKIP} fi =20 # Use the legacy version if available to support old kernel versions @@ -141,10 +140,10 @@ check_tools() ip6tables=3D"ip6tables-legacy" elif ! iptables -V &> /dev/null; then echo "SKIP: Could not run all tests without iptables tool" - exit $ksft_skip + exit ${KSFT_SKIP} elif ! ip6tables -V &> /dev/null; then echo "SKIP: Could not run all tests without ip6tables tool" - exit $ksft_skip + exit ${KSFT_SKIP} fi } =20 @@ -399,15 +398,15 @@ setup_fail_rules() -p tcp \ -m length --length 150:9999 \ -m statistic --mode nth --packet 1 --every 99999 \ - -j MARK --set-mark 42 || return ${ksft_skip} + -j MARK --set-mark 42 || return ${KSFT_SKIP} =20 - tc -n $ns2 qdisc add dev ns2eth$i clsact || return ${ksft_skip} + tc -n $ns2 qdisc add dev ns2eth$i clsact || return ${KSFT_SKIP} tc -n $ns2 filter add dev ns2eth$i egress \ protocol ip prio 1000 \ handle 42 fw \ action pedit munge offset 148 u8 invert \ pipe csum tcp \ - index 100 || return ${ksft_skip} + index 100 || return ${KSFT_SKIP} } =20 reset_with_fail() @@ -421,7 +420,7 @@ reset_with_fail() local rc=3D0 setup_fail_rules "${@}" || rc=3D$? =20 - if [ ${rc} -eq ${ksft_skip} ]; then + if [ ${rc} -eq ${KSFT_SKIP} ]; then mark_as_skipped "unable to set the 'fail' rules" return 1 fi diff --git a/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh b/tools/tes= ting/selftests/net/mptcp/mptcp_sockopt.sh index 019d4dc91d70..fccc5c504050 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh @@ -3,8 +3,6 @@ =20 . "$(dirname "${0}")/mptcp_lib.sh" =20 -ksft_skip=3D4 - mptcp_lib_init_ns =20 add_mark_rules() @@ -29,7 +27,7 @@ init() { local netns for netns in "$ns1" "$ns2" "$ns3";do - ip netns add $netns || exit $ksft_skip + ip netns add $netns || exit ${KSFT_SKIP} ip -net $netns link set lo up ip netns exec $netns sysctl -q net.mptcp.enabled=3D1 ip netns exec $netns sysctl -q net.ipv4.conf.all.rp_filter=3D0 @@ -80,7 +78,7 @@ mptcp_lib_check_kallsyms ip -Version > /dev/null 2>&1 if [ $? -ne 0 ];then echo "SKIP: Could not run test without ip tool" - exit $ksft_skip + exit ${KSFT_SKIP} fi =20 # Use the legacy version if available to support old kernel versions @@ -89,10 +87,10 @@ if iptables-legacy -V &> /dev/null; then ip6tables=3D"ip6tables-legacy" elif ! iptables -V &> /dev/null; then echo "SKIP: Could not run all tests without iptables tool" - exit $ksft_skip + exit ${KSFT_SKIP} elif ! ip6tables -V &> /dev/null; then echo "SKIP: Could not run all tests without ip6tables tool" - exit $ksft_skip + exit ${KSFT_SKIP} fi =20 check_mark() diff --git a/tools/testing/selftests/net/mptcp/pm_netlink.sh b/tools/testin= g/selftests/net/mptcp/pm_netlink.sh index 208669f474cf..422aac2bfaf6 100755 --- a/tools/testing/selftests/net/mptcp/pm_netlink.sh +++ b/tools/testing/selftests/net/mptcp/pm_netlink.sh @@ -3,8 +3,6 @@ =20 . "$(dirname "${0}")/mptcp_lib.sh" =20 -ksft_skip=3D4 - usage() { echo "Usage: $0 [ -h ]" } @@ -37,12 +35,12 @@ mptcp_lib_check_mptcp ip -Version > /dev/null 2>&1 if [ $? -ne 0 ];then echo "SKIP: Could not run test without ip tool" - exit $ksft_skip + exit ${KSFT_SKIP} fi =20 trap cleanup EXIT =20 -ip netns add $ns1 || exit $ksft_skip +ip netns add $ns1 || exit ${KSFT_SKIP} ip -net $ns1 link set lo up ip netns exec $ns1 sysctl -q net.mptcp.enabled=3D1 =20 diff --git a/tools/testing/selftests/net/mptcp/simult_flows.sh b/tools/test= ing/selftests/net/mptcp/simult_flows.sh index ad589c7699a1..1fb2cb5d6b5f 100755 --- a/tools/testing/selftests/net/mptcp/simult_flows.sh +++ b/tools/testing/selftests/net/mptcp/simult_flows.sh @@ -4,7 +4,6 @@ . "$(dirname "${0}")/mptcp_lib.sh" =20 mptcp_lib_init_ns -ksft_skip=3D4 bail=3D0 slack=3D50 =20 @@ -32,7 +31,7 @@ mptcp_lib_check_mptcp ip -Version > /dev/null 2>&1 if [ $? -ne 0 ];then echo "SKIP: Could not run test without ip tool" - exit $ksft_skip + exit ${KSFT_SKIP} fi =20 # "$ns1" ns2 ns3 @@ -54,7 +53,7 @@ setup() trap cleanup EXIT =20 for i in "$ns1" "$ns2" "$ns3";do - ip netns add $i || exit $ksft_skip + ip netns add $i || exit ${KSFT_SKIP} ip -net $i link set lo up ip netns exec $i sysctl -q net.ipv4.conf.all.rp_filter=3D0 ip netns exec $i sysctl -q net.ipv4.conf.default.rp_filter=3D0 --=20 2.35.3