From nobody Sat May 18 12:05:10 2024 Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on2083.outbound.protection.outlook.com [40.107.21.83]) (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 80B3E18C1E for ; Tue, 14 Nov 2023 10:22: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="Cfzo4boY" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=iXeRir7m/GJpo26hpuongGKHLXh409ehIC+NeqsUUVPsyMxx9YI1Mv2bfKIzb4fTzBxtZCjHLxyakX6KlQ0zugphbf4RPSxYVrnf7I7R+/oV+B7bk9cBGfNU9WlqGyVjLyKEbNbmbzENKKSvXIbD2R9wWsnZjp+hWG41GnrRTCK8FAuQLDczIHsAXH0p5s1DPGHeqLuEUNo7AiPggI2pAS9Onb5eA7Ol1Af9BajFq/I6ryoCPv/2+XyGqWxi+I2bPHGRVM/eLffen8B5KWDmvUTwV+phP+JRvbYw5H7WsVTqxjbngYKjC3qdx8F+OK5uVuyC7lLGYOq3A4gEtYxP3w== 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=nZOiNOxf8gKs8PpVb5ZNltwtTx/my4/f6Ehn03Ca4Qk=; b=mEhEoUGGygEa2oTQH1UseikXw/S3WsY8BwZ45xxpw/N7LrnyKmAkqoLRen4fICacLjQ3pyReOU2iO2/TRHe4RUTlfqgxv7h/LppU7FIo82aRhlTtE1Q6K5ynh9lB01C7E1rWJTZzhchlCQjWXg0losLe9Q6MeFUdXu8PmjVXKHf57gp4mj8v1Y9MzLrXrhXbT6YpJ1VaECHCSddvW/w2Ucsy9cHGDoNLrj80AOz4eVcJOLP0IY5zAgPoPdHAO5DbfGy4auE2Qa3q421w6wt6+eJ5ioHH/F9dCaoPIdn/SuKV73PM0393YhQXMWppbGOd5rsGAWYYXowj56Pu7syFEg== 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=nZOiNOxf8gKs8PpVb5ZNltwtTx/my4/f6Ehn03Ca4Qk=; b=Cfzo4boYjEAtpYIJ+BSsoGbgBnsFVbqwkGV+a5pH176HAnVULc3JM6d9sNmk7Pk8RTXDh/cfRYJbB+ZQaOVFo8dYy12NXV+Lawu4c7HEfiZ2nTHC1LSACC6J7PZdQCsyLEAFV1BxrvK8rcodKJBssdk2IhoX/nDh6jhl8xCszx2xB5/fJiOwsmeelNbvnVWLmpSYYovnqdH5EIzfe1JqVefkc/YTtdCIlFSnJ7hYrhb1Cm58Mlm0FEYybLUzT02SIZ3ED5sS2/4P6zx6YdhQyTLM5yYRL/DdS5Gg8+o1Kln4QlJWhq9KE7a/905/u8Ed243JGw96H3AfKBLY304cCw== 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 DBBPR04MB7946.eurprd04.prod.outlook.com (2603:10a6:10:1ec::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7002.17; Tue, 14 Nov 2023 10:22: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%7]) with mapi id 15.20.7002.014; Tue, 14 Nov 2023 10:22:00 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v3 01/33] selftests: mptcp: add mptcp_lib_evts_* helpers Date: Tue, 14 Nov 2023 18:21:31 +0800 Message-Id: <59f3177412c97eb5b0f881bb047b80dbed479bef.1699956980.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SG2PR04CA0175.apcprd04.prod.outlook.com (2603:1096:4:14::13) 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_|DBBPR04MB7946:EE_ X-MS-Office365-Filtering-Correlation-Id: 52f0507e-3f87-45ff-50b7-08dbe4fb89f8 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: H8aQEXiT9FnjOYp4vchpovqMWdeXTvSmt2+Nvnulon/UV97dxXPk+qPX1nIvXIb1DQqsrBfo0lIPieAfo5GOUb5wCZyLg8UA2vnvCYfsELi8+QBTlhZ31nifdLoaF/bxChdB+BpmEdoagPncaWGY1Q1y1/lbObPzlib2Mo0/E36FBxKdIMuL4ep1CJwpd0rv2atl0kIWFfQqtgeBfaGpljNu3F1Na2NU7G9Kmp5VXiM+wVQrKa+6aFQZrS59HR6lnZZKdC5wSCCmXSUZTls+aq+9kYipVS2N+5iGDK9ufusHJS95aH2/dIOnHRHoCro+wschamPWuXoeuSJ54nEepTcE9XBtcznw96Fc5i/4xsEE7b75aSHhMCgGpreNwoVW6phjSKAYdXE4Wbw9FpYm6eljDuQQYP0wA2M15+E+1tfOeLRvv4v8LAUqIGlQ4eRW8yCZSVo8zzxA7hdD2azhjyb0ziDK6a4SDwrZVTV880y6bL0fspKr82mwXc2uS5a68fFARgN8WGDBtzmw83QkRD+DgrTHvyY1PfzZ99RY4cE5jve60o6X1rTFTsc9eb9g 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)(396003)(346002)(376002)(366004)(39860400002)(136003)(230922051799003)(451199024)(1800799009)(64100799003)(186009)(2906002)(44832011)(5660300002)(38100700002)(86362001)(41300700001)(2616005)(107886003)(6506007)(6666004)(6512007)(6486002)(478600001)(26005)(8676002)(8936002)(4326008)(83380400001)(66556008)(66476007)(6916009)(316002)(66946007)(36756003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?HTlylINPgR2lqWoCUlQOT2kv8WVlTiNjzFD17AleknWLBNNkRssOrw+4zgIB?= =?us-ascii?Q?l53SU8cvlUYW3b1MvLQgaJCMiBvRCPHPEPU6wVV9o3O5hE5WxGxkAuf+2z9l?= =?us-ascii?Q?RxzO1aMl9YqHudhTDlTAmcbQx/uflMzb2Tm7SaNqQ5Xe3NqHPC8h6P3S0UUo?= =?us-ascii?Q?v1Afv0oxn9wpZ8HMaTk6UFNEHuAP/g5fTHkuAsYmHhOAejSy7vXidVJRPHs4?= =?us-ascii?Q?inkX/ibNib4FHvKaXM4L6eOPMavHpttr82KH8EGatgNYi93DJNLt8l65Owt9?= =?us-ascii?Q?NCcKSKf+1NEaaR1hRZhP+O1PJt32uxVzyDoEqwi4EYRIyOh42uHBm6mcTwOq?= =?us-ascii?Q?p1Vll65MCvXRiTRBOzU/VwzmnKLLmPc6xPAcOdddCUrnsSBkZXoLWrhMy9kl?= =?us-ascii?Q?lOFNXX44QOVB22RJ9RS/uJ0fnbL+7WzsRgkMqBl9XXUbBCyFk1yiQfhCRLH8?= =?us-ascii?Q?10sSOGdLIJVBwTzNFwdrfi9rBeiG5SdFg81QE7zVbFVr+uKVZg0zXgU5JEuy?= =?us-ascii?Q?fYKRaCjB0MAyDzDosDcoKThP4ma8LNU2rfY9LErynZSE9BDL37Tbpl4hp4Qt?= =?us-ascii?Q?im8VYIJejllr1r2R8QluEJjVFs+6+rbBrP99Vt+GFs+ASCIZrj+cKTYRFkfV?= =?us-ascii?Q?P7JZXzSUTeRfP/xWh0UGOG+7EhN8dy4wtpCWeCjLlpYNCUfpWJRnV5p6DOZT?= =?us-ascii?Q?RKOG5nHkP76ZLnZmMGJPAMUPJ+zAu34hJqcFkWlxbnwUd0QD0+iDFucImHz6?= =?us-ascii?Q?xNn8CEnd/gYpKVT5NnJdjbYwM5HXHHEArULRP2EsnbFBQnKkv5dUW+XG0AWZ?= =?us-ascii?Q?Eon4ELM53ErYqWtCI4+tmzqXTuSZrG2ldTG3R3eapJ/YRN2V6STYWiyXdy09?= =?us-ascii?Q?PjrdJ8SvibBO3Ek/ghfJJBp/CNj81DDskwql5R3De6EwfMdC6J982IumV4Io?= =?us-ascii?Q?UhyMhUj/V1NMa+unL3HBail0CdHknrvg01OzDI1Es7D2fOFN1r51wW1/1Jb2?= =?us-ascii?Q?jKkZ3JtGJ7BSzH8kJJcITX3ecs59z90evA+YsbODrj6BWD6bndqxAY5bD2ex?= =?us-ascii?Q?u10yK8fXk6JCVJighJ8U33D4rDOS25OWQJqjYhB41nCdQQhCXc547D7bZL2L?= =?us-ascii?Q?xD2Y0Zd/83+giYoeJc3JwEQGKKZxbZriqZLb87NjltI+35JhW+38LISwjhCw?= =?us-ascii?Q?7jrnKZlW5RBL6HGEuLAPg3Qoe7RfHStjdpdOa1f0uvJeKYI5/I3umJHQGR3+?= =?us-ascii?Q?5WdS8+I2wIMQOtnBM6q4Ngp42TOxCvZA2pLMpbDjw0zd5jF2lJDB3tw2zJqr?= =?us-ascii?Q?enEQvH51qELr8Je11SK/ztH592yZekvnv+Txv1yV9O6oRZRZuKzxutUJlBeL?= =?us-ascii?Q?A9ktHa/yYfd2+K+A8uqfyix1NbXvN4nh1pYHDe1TlqoRzrb/S+92U2o06BOT?= =?us-ascii?Q?P3DxAyNI5INfdr2nNblS3HtmhO7J/MIjXV2f7DLVwbkAKctiTpmZymgQw8u8?= =?us-ascii?Q?qeQ1LiM4MAEDMx8ko/7C1pl39YeRe3cwxh0UVgws02BqXK8+biQO2iWBsnRU?= =?us-ascii?Q?MYKZEM3M/A8Cts0B2xDPtnvtCCl9pJs4KXogsf6u?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 52f0507e-3f87-45ff-50b7-08dbe4fb89f8 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Nov 2023 10:22:00.8956 (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: DaSbQjVQhpX4bhy4HZrk2On1GOOwC0o+o+yzqNwCLVrlYDzfuK/6SvJCqxMN2PjsnGtdzgY+XK2sNNb3Q0/6EQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR04MB7946 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 24a55f7622f3..42f3e49db74e 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 mptcp_lib_cleanup } @@ -461,12 +456,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() @@ -636,12 +626,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 @@ -2883,9 +2867,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 @@ -3258,10 +3242,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 @@ -3271,11 +3255,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}) @@ -3286,10 +3270,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") @@ -3302,13 +3286,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) @@ -3423,7 +3407,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 @@ -3447,7 +3431,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 @@ -3470,7 +3454,7 @@ userspace_tests() mptcp_lib_check "ip netns exec $ns2 ./pm_nl_ctl dump" \ "" " dump addrs" chk_rm_nr 0 1 - kill_events_pids + mptcp_lib_evts_kill wait $tests_pid fi =20 @@ -3494,7 +3478,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 @@ -3520,7 +3504,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 466fde97d3f4..4f741725436c 100644 --- a/tools/testing/selftests/net/mptcp/mptcp_lib.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_lib.sh @@ -326,6 +326,69 @@ mptcp_lib_check() fi } =20 +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}" +} + mptcp_lib_cleanup() { echo "cleanup" diff --git a/tools/testing/selftests/net/mptcp/userspace_pm.sh b/tools/test= ing/selftests/net/mptcp/userspace_pm.sh index 005251b61d7a..55ed3ea0a691 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 mptcp_lib_cleanup _printf "Done\n" @@ -187,24 +184,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 12:05:10 2024 Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on2053.outbound.protection.outlook.com [40.107.21.53]) (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 A312816412 for ; Tue, 14 Nov 2023 10:22:09 +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="TD4qx85m" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=TGVncGlW1j3PBLS/UyBdBmwFFms5lpCbeq7abpH7+Q8hnZpISEag8CS5oyeR1mQRJdPbgBS4VPFQvgIuT8IE6fVBuWyNph23rXYEegsChvoQ2f1aSc0j9lDOVUSGv6W18ayy7GxQVLdRY9rlDW6KmqA9s7XXp8ybstH55dwQ59AweDExDWrw2xghyQuUIGGSHgoT030NSUa07rlyDNyyyVQilPYVyBzV/6GhZdPmcIgZUIW9vSGKRWjA6v266WBIYg1NTaPRtRqh81zzyf3e5OhQ+LxaEH34lh7TtqFl59lg38HZVzca5i/zBV6xsZ9Z0T/O/LkWQvuebsZ9w8mTkQ== 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=zegY6h/fmqcRrg/93R+5oej5y1CXdTsZnW37dwfOeEA=; b=Ry+hygW3xM3cMT6wdI/y8jrOJpw3Uo8rMEHhSoNBeMz6QMs07h0NS619ZBjdTwIH2t0XZnEZLNuok6fyIxLiv/OUyGMPTxyptHMPXDXqRdit5ZOimRn9BnxDLlyYixNHRICKBdMJlOquT9c83+5/ACP3/7o84TZ1d96dHzj3oiWpBIHqzq8uYP8UUNGqn2/2Qoko0MmFTGS7mW47sR2Mkvazia0Y9ZALwRLC06jboEwZlPBXpfKH3NLJS2Nw3h25yh62Fxcro1/dxXvJpJPs5Ga96bjM+jH8pQrIxD0WqMy4VqZy1LbTMUKG7XipHtQGgNBwGOHm+trmyJb9qV8eVA== 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=zegY6h/fmqcRrg/93R+5oej5y1CXdTsZnW37dwfOeEA=; b=TD4qx85mZjeuXLo1U26qt2+dybIEwFRJXVz0VXlsWDDA4c5qWXYaIYrXqCYgy32rxgDSVgWNY7W7rbZZzbTTzKB/7POc6EaoNL16911GjT1gWMvub2etCNKMGIuFi8azHw96aqR24NFUxu+A8dfOi5CvSPrpO1OZIwETxpjoRz7MesWzIGFLyDw5yvJNS0ksLktHncy90Zikis8pZfUVWOpcBKk8vmRVTs6uNQOM7Ot9z20+EgDc8Kv7mtndfBj+4q0WQLnHFghy4lsfuGlEDsLvdshoV1f8pd5dHX2gB87LUnSwLRTIwpWJ08moU3FCeau78QdFAgCVfZbwKC03mw== 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 DBBPR04MB7946.eurprd04.prod.outlook.com (2603:10a6:10:1ec::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7002.17; Tue, 14 Nov 2023 10:22:06 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::7102:259:f268:5321]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::7102:259:f268:5321%7]) with mapi id 15.20.7002.014; Tue, 14 Nov 2023 10:22:06 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v3 02/33] selftests: mptcp: userspace: capitalize test_name Date: Tue, 14 Nov 2023 18:21:32 +0800 Message-Id: X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SG2PR04CA0195.apcprd04.prod.outlook.com (2603:1096:4:14::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_|DBBPR04MB7946:EE_ X-MS-Office365-Filtering-Correlation-Id: 03e0a088-adb0-4d15-9b03-08dbe4fb8d71 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: NFVxyTnZ+ztQMJ2c5FoI3cwqXbw2iOLCDWFaWbDnQiegAVqelyJVSzOhU1suYKORKPkIoVkHh1XxyrSFQ1xfHyq85Q7BU/8V7BBfYUbrMGPzXhKzq2RiXzgdw9axb+XsFe0CRX1pfOEqtdRqvesYpq/7dyip0FQRBCTiITgbgcXAeL3lpszNsJ1573guAVXBio70KWnHY3lv9OlA4VKKHQqtZKDpJbnnTsZy/VhSE12b3VNSR6GAvb0q7+6HDBQ9xIas6FUjgINOg+kvKMcJvX1oVfxTiTijgcStOYqUPH58iNMc4JcCjaH9WVsa8BaVzMLHa9Rx6RxlNQ1D/5FZDvSXXlNcevmoSkBQWatt3CXyW61NTxfsfM4N6ixwusxuX97dvG6NvvUOi+GJmJS7Iag2mh+ImKutr9vnMchwmwntB6wRXah5s3S23K9MozpaZl1hGxZppP9QqP45UxKnag+eEA0x1yCA8Vc2YVtB86L9ICqI/RIV53OXuS12jEzaxVI5bLckkTv78nlL0mFX5jH0Eyd5vlRwq6jO/mVCQZs+yqZzc7KVf23PT00PSITL 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)(396003)(346002)(376002)(366004)(39860400002)(136003)(230922051799003)(451199024)(1800799009)(64100799003)(186009)(2906002)(44832011)(5660300002)(38100700002)(86362001)(41300700001)(2616005)(107886003)(6506007)(6666004)(6512007)(6486002)(478600001)(26005)(8676002)(8936002)(4326008)(83380400001)(66556008)(66476007)(6916009)(316002)(66946007)(36756003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?QkYdFbxtiiP7T6rwaJM4dJiLREXwqnzPxIjWV+ugZDZj9wm7S6D7y1OTWiGr?= =?us-ascii?Q?7w9K+bTs8RTKUFvuS6KYmIeYgT7jfFqMllxEj4W1mMNcPXFWX9FS5EtqCOl/?= =?us-ascii?Q?tPvfJJf5JT2SX3tnmIdD/hgz+6IH+oqR+iSfA0egog7hb0x7jBqtB9/D4gu3?= =?us-ascii?Q?xqIgsr29FrYWQL0RpoO5l9rCFLk0dXLKg45EaUzzTt3c6Ihb7/OVTgs8aif8?= =?us-ascii?Q?cUmXlklJ0JlB01ZzQlKb2axeSUqdeyLEF0I/9oh4TjOs2L7n3GA7y4rmjGH6?= =?us-ascii?Q?1P86Ow9pUCyix3fbB6Rlou+mhlmuVQm3SBZVEkv77pm+rHE0XzGPTLrf/Olz?= =?us-ascii?Q?8zZ8V1o2MlH09lM4b9i3VUChvRIItJ2L1woWviNFkwawBluAhay7HSIyMzAq?= =?us-ascii?Q?z+spWCVdBUbqwaFd+rdvUjArCHROPz7hFguSLtZ+hqAOgu7kXFNEKEVQeQre?= =?us-ascii?Q?c5T/ym5MVeAqYuKwS78XNr+VZnRse1ZixJjO+h1RO81mfr70mMYkA16nWYZo?= =?us-ascii?Q?ZKQX9a54ZITOyZV+S+Xa1bxxNOBsZDZ3DtRuEEuCcJHjJyT+iiuhP3rDGPso?= =?us-ascii?Q?2BJT8utTqrbsP16JOsVXJRwRdZdMvx7Pjwvkwo1l3yGxuLQ4KuZeC4jzg8io?= =?us-ascii?Q?hsxWBrU/8p+h/yJ4/unwLPKY1GcWWmtWUARzN+1h1HAJZmEYFPFyuC5fPNFR?= =?us-ascii?Q?od8Ql2DcazK1rV5d+WdkyJ5wgJTAAWIlm2/z8BAjULk9PDRsnOth7dqdpPou?= =?us-ascii?Q?T3BcxM15hvcQ/Zb++6lCALwaTtVIwC1BsSPSpNg72ZOlVUw95aecNCVMIIJ4?= =?us-ascii?Q?lfUEg0okw+NNqRLauc3hbG9iKWGNQziWC8J0RI5f1Nt0UzFTCWU7tVF3tQbK?= =?us-ascii?Q?sH+Id/5Wi17VTrJfeIxkS0XEvF0sD75OnHsjxbBlY1RuLHEJvCcoxdS10PfB?= =?us-ascii?Q?mcLbTbbBmJ/0H2ZfhfxF857kPTJmz7RDqo3O6FxhHDXMTAleq+nk2maMmF22?= =?us-ascii?Q?Ev9XwF04rczb3XTypIjPFE4sFk5yVtbrwVca+cmdoKL6LNCf9xnYFB/UJ1Gf?= =?us-ascii?Q?2zH8Q9GTO4lK0Sl7WrxkIHH1EityuoCEFyMizhDnLV62vcOmxtBrvlF996tr?= =?us-ascii?Q?0sxzwT0Zjum77nrIvaQdLvY1gSdrIBNub3IC1srxeBVK6/J9rXO/G3WUrgjK?= =?us-ascii?Q?CVqYau3XWxtRqf5chpRw0Xkx7ySsKTr5I4Htdh1qUviRhxmUgi28yCHmRbO6?= =?us-ascii?Q?smKI3z7dfqzpaOZ36aLvzPOzbWZ+3Q1934guaPxyknyRb+hqwiaIcM6tPp9d?= =?us-ascii?Q?8Me5vI0uahPu3IdY4PKZBnShtpCic5td3I963Y1E5ctF89p7yGj1gdEg2tbo?= =?us-ascii?Q?XqVGOpNuvYbwAT1/sIvv1/1rk3SuFygeqABOummgOmyiBWTto5IXzZYbyL/k?= =?us-ascii?Q?BtVm0NPq/wBrNVF7Qhw3+SbDVVZAjK5mERNWc2lkb7p7EcetgVS82qTT90pA?= =?us-ascii?Q?Al0T2+231C+N1WsLaCkTQLqBPC7Twb4uOJz+DtqRBDr9CNFywvCAWguSrE1B?= =?us-ascii?Q?3FbJbVV3/dfY4D+czBEzC7Ee8D8+diCq6tFG16wx?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 03e0a088-adb0-4d15-9b03-08dbe4fb8d71 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Nov 2023 10:22:06.5545 (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: NyTrI0kSi7oy7qnPGw7p7PZq4vK5DWjc2GXEKjIVoShU8qvko1SpdsEWRrSZY1yKVM4eWu+TyY9cl5lUNia6vg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR04MB7946 Content-Type: text/plain; charset="utf-8" Most scripts use uppercase variable TEST_NAME, but lowercase one are used in userspace_pm.sh. To maintain consistency with other scripts, this patch renames variable test_name to TEST_NAME: test_name -> TEST_NAME in userspace_pm.sh Signed-off-by: Geliang Tang --- tools/testing/selftests/net/mptcp/userspace_pm.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/userspace_pm.sh b/tools/test= ing/selftests/net/mptcp/userspace_pm.sh index 55ed3ea0a691..f1d5cd4ab95a 100755 --- a/tools/testing/selftests/net/mptcp/userspace_pm.sh +++ b/tools/testing/selftests/net/mptcp/userspace_pm.sh @@ -55,7 +55,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 "${@}" @@ -69,9 +69,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() @@ -82,13 +82,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 @@ -101,7 +101,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 12:05:10 2024 Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on2058.outbound.protection.outlook.com [40.107.21.58]) (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 1F41518C1E for ; Tue, 14 Nov 2023 10:22:14 +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="vriV4eoP" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BykNOvv1v4AxHo+XNdJg8hxU688cSuImMMHAd/mY1txHtrFezZ2ufelw18Q7230UruaEHNmwAwr/FHQybmgxicBL1iCjD/gISsaeX3z9CZ5BLY0/kRbj6rnxzYd76mrDNaBZ6TceJrFMZhet3lV3Gu+X3rgU+rNh/yFvBodd+HdYmkRoljo7kdKqhRmp0XnrVSNLFt72Zp5OC5S9Qe3m+Q5HJ8htVPZtD9FH4Mj6Hi4aMDPUk5AE0TjT6E+nQptJ4tUfXQ9iJgceQzw2wupKO4eFZT5FCHPdTPsAn/M36KyZjsBge/Q+fyVnW7o6HH1HyQwPkvpaIMENFeXVTmOHuQ== 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=7R07kNJawyzlHpf3LIoGYdhQd0fUV9zMxON6SSgrlLk=; b=Dvg0e/vMJSUw8KIjANRk4qpph3yw6QQnaPJtnzU1KZVDWNmwIPRkGWESRATB9J66tEs6Oy66/Nsu+EGHmJ+79tumB3RUiOHuSRBJZg+FHMrA44i9Y1vv31/Dvwr4EdDjkcKzquyR+AaEI5XfdLprNvGLpcl1Wf5jCdsgl/zag8Cz79/Rf/iDA09p/zSBy9MYeL4Qr6bWa7nIvdax6QvsBkjdFef6n9RvKtvKE5lcvgnVi9Ja8XlgGlwoUf5bJg2DlGfMVJK/TG5Uk0E0Nrgq5lO+I9L4DMV6spGET46DqJSexyW1Syd8ps43JUoITLI0+LiB+yAMtPxpIZOiGI2PSw== 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=7R07kNJawyzlHpf3LIoGYdhQd0fUV9zMxON6SSgrlLk=; b=vriV4eoPgnDsXgfinnL/P+OBABZt4EeB4ElsPbmHhcSR0PcdHIgm9et2KkwNRPm0C9YRUlKXDKLO5Ho7OZlDroR9PSKdK2gety46LWSa3LRjlJMZmZKpMBvX3MLhuBuCMNToNj1iUNDdWZnTFpZM1js7MixGZpTWuyKLsiWjHUduM49/28iw6x0np7BeMSLpfT6A8cpSy+AgSM5pHwjwWHGT1l0LsbL6gWglUt0lrgNoU5eNP27fmduw9hT60Z090PXdwswBb7X/hLUd+BdoycmRKiiiWK2ZHWuF8JXEtq//JDTXF8dZPBAsddlZbxyA/RVaPyTD/yuwB7uqbk1x9Q== 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 DBBPR04MB7946.eurprd04.prod.outlook.com (2603:10a6:10:1ec::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7002.17; Tue, 14 Nov 2023 10:22: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%7]) with mapi id 15.20.7002.014; Tue, 14 Nov 2023 10:22:12 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang , Matthieu Baerts Subject: [PATCH mptcp-next v3 03/33] selftests: mptcp: userspace: print colored output Date: Tue, 14 Nov 2023 18:21:33 +0800 Message-Id: <557d147ff232371a76538789eaa90525b187a26c.1699956980.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SG2PR04CA0197.apcprd04.prod.outlook.com (2603:1096:4:14::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_|DBBPR04MB7946:EE_ X-MS-Office365-Filtering-Correlation-Id: 38a5bcda-a2be-4d32-f9b8-08dbe4fb90de X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: K6b/4T/3e/yB3xXqKFKoBofGTuDPENTy00fSM30YAFBKFGkMgHLvMk2AYpe5xCDKAUZ3qL1pka+kble6FXzhAx1geczYzRKsSFE9ok8mMNuSq4Au9CvDLKIT24Fe3IhYaPCdQbO7fDyiRudeyzXnZHIRlnBb+I59sY8Bdga1/7z9GAUGo4N4/vYXvfLbVfp940mlrii8xb4Uo6XVNAV1LT/kAUz8PFe7VdMvkQwHQuU0fkqpPsuh2TuAyMMyViMND8BF3FS40Ov9tenM2BbP3ZBEGJmwGySSEwtoDbB3DctteqjqnYE5B9sgLFCPQ3rFKotq8Bywxw51ylTx4MIwzS2e5+ixMsNBSg9xtA2zu0jWwOTPdCU244IrV5WE5wX5RTqkLciI7AkjR5zQ/KDxbiQrr1v4MB8AYToe2OuwXH+RxIPeAlCF/oMGsVkvU+BjEiipb5eX0qBuTqY4PLvDE6nTj/uanIxG+5S4XoFHVJOJX3t4872Fc/NP3Vr/oYZl63RYf8iKK8eN4PRBfy+oH8/nPMi8BmavBCu1aJvVGLROy4K/JGqooqxjMCQEOsol 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)(396003)(346002)(376002)(366004)(39860400002)(136003)(230922051799003)(451199024)(1800799009)(64100799003)(186009)(2906002)(44832011)(5660300002)(38100700002)(86362001)(41300700001)(2616005)(6506007)(6666004)(6512007)(6486002)(478600001)(26005)(8676002)(8936002)(4326008)(83380400001)(54906003)(66556008)(66476007)(6916009)(316002)(66946007)(36756003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?SyJt2Tg6ndxxHhxxSKFUQECdwQz3U8r7WZOJUucwEZlBXdsv76MtZl3tf+8O?= =?us-ascii?Q?Ce2uQt5znTcgy98T92G8HvOwd58+0nBXZlCqOV+Ap5OlI0iBy+FGwtjbQXid?= =?us-ascii?Q?LrDCNPd3JX2EBgxvcevCEHM7SyXXDKU5byIm/7OMluxKNoAI7erh8+ZIOaSF?= =?us-ascii?Q?rfznqZBjO7Rm988syAbtCJ8jF6+NB6bVMU+ufEJlWzvHJerium6qnNJu+ECs?= =?us-ascii?Q?TC8HPjGjv+81p/6qv5QmDhYUkzxLJ9jjTLBPJI5z7yOSHv1815EDNxbK9MNU?= =?us-ascii?Q?yHT4ngBSVp0YIGlJXcnuHtbUrMe35EtJJSzQziBqMXw5V5GfIACCJZ8A9rAm?= =?us-ascii?Q?FkugE27xe2xxWiSGr5djO5Cw8hxwKOyqx4IMpCWL4cvObhFlNnQnX3zw6l8Z?= =?us-ascii?Q?cxvb1jHi4r5NS/7TwvYaGl7Q6X0Ao1FVD4GHyhwFtsiq24PtHxMOSvP6SPPu?= =?us-ascii?Q?+cFgX8zn+dLwsDXf/wlC6BB05HcZVpIxLQltIWn2v0vJiYeSZFWuxQZaBIb6?= =?us-ascii?Q?8vMHhOwEQStyED23CnFLcqESeMJg6bsDCGe4o3VSj3cYQ8PPt8xk/WiWKEuL?= =?us-ascii?Q?XTVaq7jJL42HjEddweq/pU6zgARyZX9ZOOYBe+RlpdNnkUxP5bX5RukoPuDG?= =?us-ascii?Q?kHAtlR5YkJuCot+zX2r/MldCWX2FkFTcPNYPm3k7/B7nPcyNr5rMkbBkCNlk?= =?us-ascii?Q?dYdcwpZ+QMKdJEg5nTi/Yq8PVavw8x1H0aJUfLgbVjD2tfvURgQ5SUW7gPkh?= =?us-ascii?Q?8GJ3wABphrp5ypi0aOtoiMC5da0VJXnuqp1Nc3L68IUNcvOIcG5E+xtign10?= =?us-ascii?Q?W8dgxb3lNUmw9uMRyCG4xcXVkyATGydAebvXI9zHZQ99e1GFHgc06EFUP0Dq?= =?us-ascii?Q?F6srVHaASC04gyJDzgtsmp5e+LjTtwSg99RewRLbRj1OOs82RMXze0mS9K4Y?= =?us-ascii?Q?Ew+IAq8uKjskHAZB8yGYwbw1g8iA/uwoDK+NfYq9nr2c6XjwqEBi60p7Sxwa?= =?us-ascii?Q?x0NnF30bF714TIbgn395X2BMvVnTCFMzsSyzpo1gvQ51bQ5mN091pAKUjhN3?= =?us-ascii?Q?V1GIUS8M3Xs8z0mj4Ik39JKMVvtr48AGCj7C8I5I3qVrqZMWE4e9l7anhwGR?= =?us-ascii?Q?Hvbi408hQRqySzjr0RqA9X/p6sS8UWPDI3hYCU3ijo7d7zIcQuTwJC594kxJ?= =?us-ascii?Q?1Rfrl5sSBuZnq7s/DEngluhYBikCg+8+X5hEluBJKCfmtJIkEtw8t4r2LXPI?= =?us-ascii?Q?HGsyL8zQEu9jiQQRJjPcC7WO2Dse3BZ0lPEA9inLNcJkexkGIkyQRCx0XF1S?= =?us-ascii?Q?CA/QBNZSEkCKKF0sqMW3T7iXtX+0n8yX5VMlDn3jbE89HmrjM1bJ7xnTF+cB?= =?us-ascii?Q?2YCah4TPHUhBoP0/Ol8LIlQ30YDpBpE6CfmbQXXHPzWA1KOef/A5b3+Jb04x?= =?us-ascii?Q?G54eiN5ALfzf0py4073gEkYygubi25MqhYCq7Mavg6XxHKrLqBOrSdF+EJQC?= =?us-ascii?Q?n5+PaBQVzMEkCdZq7pQTWGjH/iZy9VYwQlJ3dqz4+m4F8bD2QZRhak7gjYvd?= =?us-ascii?Q?Atz2lgLoOz3tQz8MrvSJ2Q3P8xLsK7GFTzfUKszK?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 38a5bcda-a2be-4d32-f9b8-08dbe4fb90de X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Nov 2023 10:22:12.2763 (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: 6mE6FlHPPDY1jNPBY3w78CtYMDw/CasYWW6mH60moEB/H0kyMpA028LDP3aObDYLCoCNeb6vppA3GPzzJVa/zA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR04MB7946 Content-Type: text/plain; charset="utf-8" The helper mptcp_lib_verify_listener_events() will be added latter in mptcp_lib.sh, and be used by mptcp_join.sh and userspace_pm.sh. The former prints colored output while the latter is not. It makes sense to unify them. Use mptcp_lib_print_ok(), _warn() and _err() to instead print_results() in test_pass(), _skip() and _fail(), and use mptcp_lib_print_info() to instead _printf() in print_title() to print test results with colors in userspace_pm.sh. Reviewed-by: Matthieu Baerts Signed-off-by: Geliang Tang --- tools/testing/selftests/net/mptcp/userspace_pm.sh | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/userspace_pm.sh b/tools/test= ing/selftests/net/mptcp/userspace_pm.sh index f1d5cd4ab95a..0614611b7821 100755 --- a/tools/testing/selftests/net/mptcp/userspace_pm.sh +++ b/tools/testing/selftests/net/mptcp/userspace_pm.sh @@ -63,7 +63,7 @@ _printf() { =20 print_title() { - _printf "INFO: %s\n" "${1}" + mptcp_lib_print_info "INFO: ${1}" } =20 # $1: test name @@ -74,27 +74,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 12:05:10 2024 Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on2063.outbound.protection.outlook.com [40.107.21.63]) (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 9778816412 for ; Tue, 14 Nov 2023 10:22:22 +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="fXzuYdMj" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ce6YuZrfXwKO/4e3hsmDyYjMo5eJb5iPe3R7Puf36NzdzVvs1150lUtmrlwBTkTJz13VZIo8/ZwNTVM8xmZC/D6381BFHQP6PcQog5zKwdycUWFpxQKdfQ3lwyn0VEa4IlSyy+vPo3G5ZG2aQ7rApy5exX60rQCXMbx4Gu7XstP21XUOTUNBmx8/aBaQV+oOyiq0sRwpZ+vh5smSBZ3wSaHTwnlCvsOEJ7+a6GKRLPguZ87m5ZGWRgXPkEcJwr130y6rWZh+GGrSfzHoWUZT472yNvWOHiJGLny1SCEArtKswgMqWx6Jud6cnJ5bGMcfwaja+wAf4nBXmCQU4A/4lw== 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=NwZMivfP9G1xPkclY8TbRyPXWCb+9EDTXSTndS6ksDA=; b=hSALHeNYQzS00NlqhlBD1UopqjKErLIpS2YHjUwVUI8L+iZ9KOJYMW45Ay2+9yANu8j9difHwcEu4M/ZFP9879D+1HcmtiFRZwU22PZF479wASFkmy0txLDNQd+7pjv72AT8ppOCpGBb+qiuQ/mmjMoo0cQ77G8gaPmuEg5GNASvv821i5GvVUYqTD5oaSljnuowXmbE2UpCYvoqsQHulp6E6zOQeXG8yhQ1QCo1AIvCg0HHW9AU/ub1IPgIX/UmpgOi/GrixQy2G13gw2SlG0PjRUxS1UPizhKxTLXPvqkDbt4Ogv21+/dsa00kz9BYQrEnhw5rUrfGF4HcOlz0Kg== 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=NwZMivfP9G1xPkclY8TbRyPXWCb+9EDTXSTndS6ksDA=; b=fXzuYdMjo8IRrl76XnjO1Srb475LnPc1lxtzjioZlYk4/98XH28a6gZFDJi+qWC4gHW+jGd+/+DRKP++lhIWmqVdyOZWxovf+s/UlPCAEm8TatpiW6MF4hGQYPQoI4quBxqldR0z2lqWOiNKly+P6j5LeRxMpFt4e0Yvt4iGzmBKc2xocAL6E3mVnGlgH1kMcfigJKERiUAb5JNBff+SZGFxol8hD1KL9rLXAway4APdhAMFQxsBIBdILyayKgCj25QHUbT4Vti7soK/f8vyY9CUbeLlg6i7GgFxixV4KM1ZaLRwtwPQCVriotY9pZ0q4oKaaCM6UYu00sMMdnld3g== 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 DBBPR04MB7946.eurprd04.prod.outlook.com (2603:10a6:10:1ec::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7002.17; Tue, 14 Nov 2023 10:22:18 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::7102:259:f268:5321]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::7102:259:f268:5321%7]) with mapi id 15.20.7002.014; Tue, 14 Nov 2023 10:22:18 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v3 04/33] selftests: mptcp: capitalize ok/fail/skip Date: Tue, 14 Nov 2023 18:21:34 +0800 Message-Id: <690f4c0028e1c6ef6d55ea8b9f9fd3324a3e57a5.1699956980.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SG2PR04CA0186.apcprd04.prod.outlook.com (2603:1096:4:14::24) 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_|DBBPR04MB7946:EE_ X-MS-Office365-Filtering-Correlation-Id: 5f01f9b4-88f2-4e10-f786-08dbe4fb942a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: nJlPaMbiCE3Yzm9A59Dmreb1+wX7LatIt4pJYJHCdLy/RngCNmCKPA0C8fNkEUvnGjNcOQAZtd3eB1Hfa4Vo86WF5eo95rPggX6n0wkW49Cjnf8VdIhGyOogmfj4zM2CC8eM/JnAujtQoVa1s+GliRxodrzjnURzuKp2q+xMv/tnCJGkVDe+7UQfU2//Rin8OOoJgbOgglmalwW7qpFM7/GGzWa4o3sNJfiPDVe/+nyJF3btfPo2tt88CbOfCTr8i0n7hybfR+sY0Zicu8VSo/SNcLOkEtR/HAZ/wsicOsSvvPdCpQaJhQ5cIDLfZO2ZZaoF1PDKZM87ejn8W2jzce7rYcfqK+g7x8KYi4BExaLlvV7QvSZ5kQyThOdwpSgurBpPR35Ot7tKLLfkYjoWdaWbl5YRYtZ5VJxXQd5sIqgPOELvju1arFPj1bByRW6VZIfyHKbLG/I6C5XHcWxNhmPYTzX1+7vcqgrQgsbyYPMfzBZdxjgE/7Z+uc9awYxLNlJELnYhjQpORNabwvahn3iF6rLi12OjcB0M80TejU2oquPfWP+LANvGrCydiojg 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)(396003)(346002)(376002)(366004)(39860400002)(136003)(230922051799003)(451199024)(1800799009)(64100799003)(186009)(2906002)(44832011)(5660300002)(38100700002)(86362001)(41300700001)(2616005)(107886003)(6506007)(6666004)(6512007)(6486002)(478600001)(26005)(8676002)(8936002)(4326008)(83380400001)(66556008)(66476007)(6916009)(316002)(66946007)(36756003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?HViAhWyx7A0fGafLQNodKr6E8n0SgAMcNQ/nnDZoQZf6WV2PuFkBqR3sWoGv?= =?us-ascii?Q?QhBMfbTzctjwgvVUZr9gKJ3OmWerjoi/BlVrqCT7IUiMR71Pqcgq1c4Oh7Z5?= =?us-ascii?Q?wKOw8NgwWrx12q7shxgFFZ7uqdssIEP6zBOFmTF/Jb8oh/ees5JaRxCFIb48?= =?us-ascii?Q?nyD8m/XhnngAkJ7CMW8wolUsrbkEbZJUvxBS5WSrEmFhTIVBG5/JGiSnQ4o0?= =?us-ascii?Q?95O53oXjgXzULMUkSDELZEvTwDU1cwjoK2HcImorSMFLm/g6fGtCFjsaR0PI?= =?us-ascii?Q?AM4FQ7KwIA6XHAQKJwXCslaCDz2AGf0NtALKq20tjn9Mt8ni5Neja3UIzmHg?= =?us-ascii?Q?+e4tL1P7W+mOWlEuiBZ9yBqd2aBU3baypTT3GjsYnjc90KdSoEZ6fOPC0oAN?= =?us-ascii?Q?5iB2MDPJrHns0bMi/UWFsI0uqbiJTy9RFeS+Sc+gmziqsZ3oAz8XgvfXiOSu?= =?us-ascii?Q?Rnt/j02cD6x+2JiUOMQhdIw5XJ0oXvG+5KH5UYkWPLuywJppESjcsYQOn9ZU?= =?us-ascii?Q?6cPmiGLqhyGhnq8wA0LTB506IQNxPGiWSnwa7Qf2+4tcklJHTUzCRezZGLMo?= =?us-ascii?Q?PHOYwP5F5dGmEAEgEkyLt+fgpFU+HX4264L5q57SQmFDNw7qF9DRe+it54FO?= =?us-ascii?Q?0Bx53GBM8nJ1LIMlp5zJBCw8asA7Bu9hzUyAdm9Hz5A8KG0+YLRWk1qHKkrQ?= =?us-ascii?Q?TjVxMvYtekd34rgJ6FoAsN6RFXBDks8XxYXodXM0Plo5pkzFfAp4UNQV9gG3?= =?us-ascii?Q?ILO+P8eO56CpG+F37guHxTEBOYeDzI/uDDuTo/6i82WHeY0p+jJSnVTYCRnr?= =?us-ascii?Q?PBFjiKOChhc0KdPVkI4Jlh+wVQh7A4cm5TfadM4Xt5KTANr1mngo9PukF0TP?= =?us-ascii?Q?k7K3iTo3QsJSRSkLl1Sb/DuWpvZQGsrOAI6s48/CECUWcMIDdKzgsglT9zNB?= =?us-ascii?Q?PST07VKHsqAyCFEdFAx2uCJeCEgaWM/xRRNvtgUYn5/a8+3OMPnlqoCaQeFN?= =?us-ascii?Q?HzXMFFnYxy2nKR/WRHXK8TQQGrAiWNNQv5AM57gTlEUvJyQGPILaR2sjMIAt?= =?us-ascii?Q?0azh4NfUGTIeMbUr5qgnXgMD2yG+FlKqCFot5SqfY/SRFym3XgUeJkoliIcC?= =?us-ascii?Q?gaE94viVl0ShnpjsF3vLh2gv6IAQ1RPA999zvoAGjD2wmJ4d6Jh5RQoYwqmU?= =?us-ascii?Q?RLdJDT7j7DzfgpDBO8Xs/YUIoXhi7V8oe3LLBNuCDuKI3IJMakoTYNtapshq?= =?us-ascii?Q?aOaG8tJTKjfdAX3z+sYNTTRZkSy/diTCzR2Wk9z2ZVGixkUlRTxaoinDcIig?= =?us-ascii?Q?dtXCKCchoX3+vu0vXtiKw0lgd3cwRKpHSWAeoWvX1uhg6d0qWF03SqxBAX7u?= =?us-ascii?Q?UyTFN12cnGObcLW4UX72PBwYTaWwslIFYkCDfgNGfngjaniFu92w2i3JR8ga?= =?us-ascii?Q?zFpzQY+B9kK1mFC45U7d0MEiT6qhhR+jd6jSqK/QMZKBZMs7nyuCpBMW5F5t?= =?us-ascii?Q?PEqbvumqil8DX8eGiT/iT6jaj9L9OEnUQ6PWVWkShtGax5HpPACrXUpqdsNT?= =?us-ascii?Q?L0sbc2kzW0gExcGa5pjXLXhWMPvq9ITjpRXG7w0a?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5f01f9b4-88f2-4e10-f786-08dbe4fb942a X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Nov 2023 10:22:18.1582 (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: QG79Ix00yavxhqZ/5Zjh+OtSPTvLeaKBc8Mq1TPuzWRGozdddahUG10NbQVYLqMZ/grEVUtNJBsjF/pt+QDvWg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR04MB7946 Content-Type: text/plain; charset="utf-8" Most scripts print uppercase [ OK ], [ FAIL ] and [ SKIP ] as test results, but lowercase ones are used in diag.sh, mptcp_join.sh and simult_flows.sh. To maintain consistency with other scripts, this patch capitalizes these lowercase [ ok ], [ fail ] and [ skip ]: [ ok ] -> [ OK ] in diag.sh, mptcp_join.sh [ fail ] -> [ FAIL ] in diag.sh, mptcp_join.sh, simult_flows.sh [ skip ] -> [ SKIP ] in diag.sh, mptcp_join.sh Signed-off-by: Geliang Tang --- tools/testing/selftests/net/mptcp/diag.sh | 12 ++++++------ tools/testing/selftests/net/mptcp/mptcp_join.sh | 6 +++--- tools/testing/selftests/net/mptcp/simult_flows.sh | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/diag.sh b/tools/testing/self= tests/net/mptcp/diag.sh index a678ee21973b..ab62737bd501 100755 --- a/tools/testing/selftests/net/mptcp/diag.sh +++ b/tools/testing/selftests/net/mptcp/diag.sh @@ -65,15 +65,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" + echo "[ SKIP ] Feature probably not supported" mptcp_lib_result_skip "${msg}" else - echo "[ fail ] expected $expected found $nr" + echo "[ FAIL ] expected $expected found $nr" mptcp_lib_result_fail "${msg}" ret=3D$test_cnt fi else - echo "[ ok ]" + echo "[ OK ]" mptcp_lib_result_pass "${msg}" fi test_cnt=3D$((test_cnt+1)) @@ -114,15 +114,15 @@ wait_msk_nr() =20 printf "%-50s" "$msg" if [ $i -ge $timeout ]; then - echo "[ fail ] timeout while expecting $expected max $max last $nr" + echo "[ FAIL ] timeout while expecting $expected max $max last $nr" mptcp_lib_result_fail "${msg} # timeout" ret=3D$test_cnt elif [ $nr !=3D $expected ]; then - echo "[ fail ] expected $expected found $nr" + echo "[ FAIL ] expected $expected found $nr" mptcp_lib_result_fail "${msg} # unexpected result" ret=3D$test_cnt else - echo "[ ok ]" + echo "[ OK ]" mptcp_lib_result_pass "${msg}" fi test_cnt=3D$((test_cnt+1)) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index 42f3e49db74e..c5cdb8b1643b 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -216,17 +216,17 @@ print_info() =20 print_ok() { - mptcp_lib_print_ok "[ ok ]${1:+ ${*}}" + mptcp_lib_print_ok "[ OK ]${1:+ ${*}}" } =20 print_fail() { - mptcp_lib_print_err "[fail]${1:+ ${*}}" + mptcp_lib_print_err "[FAIL]${1:+ ${*}}" } =20 print_skip() { - mptcp_lib_print_warn "[skip]${1:+ ${*}}" + mptcp_lib_print_warn "[SKIP]${1:+ ${*}}" } =20 # [ $1: fail msg ] diff --git a/tools/testing/selftests/net/mptcp/simult_flows.sh b/tools/test= ing/selftests/net/mptcp/simult_flows.sh index 436500c55e12..23f5bc0aeaf2 100755 --- a/tools/testing/selftests/net/mptcp/simult_flows.sh +++ b/tools/testing/selftests/net/mptcp/simult_flows.sh @@ -195,7 +195,7 @@ do_transfer() return 0 fi =20 - echo " [ fail ]" + echo " [ 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" --=20 2.35.3 From nobody Sat May 18 12:05:10 2024 Received: from EUR03-AM7-obe.outbound.protection.outlook.com (mail-am7eur03on2086.outbound.protection.outlook.com [40.107.105.86]) (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 9219C16412 for ; Tue, 14 Nov 2023 10:22: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="1K87Mn6H" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=EDWtMW15Dyts75H8wS9EZtJWcv6PcZwM8bAe5sYQZbXzkFGydWiNimqCJundmUMdTgwgfSSllB0oL5GVHmI8TRZpm4CWSulT/HtngFBpz/Z6UPjO/Q4uzN2sMWEGiGWYR/WR72vNmX3Op9C7hOL3394ISiK5fnFCm0dGx3NLaNfqA4GDl7v+cP8kF8nGpFuPeY3KvNIDm3mRwlRmgPs88Ygk9vzOogZsHtSu/WihooFcZ2StxqL6/M1vDHya6Sj5GF6To8SkruP/UM7qrh7UVXhdcBZfeRiXFrDod+wnVdlIidJWScbzjvplq2ufm02OhWB0vjePU65FRONN/mVBgA== 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=zsRv6aGr6mmmOPvTXHhXyzuRdf8FIBdg1IzuxNO8OK0=; b=KhbtGRIzWsal/TCgqdtg7mgj2KDMqt2sLEH7bcggpJD1AspHacQxOXgBu7bXhwfSxtzYudoki0FUv6J50TljBvL2btqyewUAKIClTEiNHA3OiyyFdarCB8Vi40IhNnU/eLTillmb57mc0IOAPSkeNxNQkV6c8OXGu94cACecWggLbYj+nVQFbuzAjlcny1ibzJq4uka82GZ7zik/Ze3E4EqeZNOz2Zo+PimGDrM7v0Hsp+2Q5Zkj3DzVdUJRyJrQUSpyrPqAV3vUUPF0km/O6VNylqL91QsyGwTstduqnK4KP420Wb6Y8aozcyjM/Yxg2D2Pu0+89sQnlYoNkW0XvA== 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=zsRv6aGr6mmmOPvTXHhXyzuRdf8FIBdg1IzuxNO8OK0=; b=1K87Mn6H3tidkV98GYrS1MGoKusHCHOCdAN+rmkJGP1zqWXNg7rtV2wv3kIhzpjr2wAmJfdjxQ/eolGRbd5ddYCLUgeUco8b5pGDPs6Go3PRnY5yiLtWnGdvMV2myyUYF/AR+irWw6eDSZZW20v1aGbSNnBckYYIOar7flgfFQtJGOvmDXyWqzR1ExmVLjnnpUokBTXHQ7T3UJ3pvEcDXVO+nUn5NiCwUraJV3yQ8jVLq4eG0d4HWgFREuwKIFSDmeKP/r0Q+tseM11AS9HlKQESOof624z7HFEdqC2GztDbU3i2gmyS9J6cbP9VrrPUvWvJVSmUrV5h2L3w3m3Cxw== 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 DBBPR04MB7946.eurprd04.prod.outlook.com (2603:10a6:10:1ec::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7002.17; Tue, 14 Nov 2023 10:22:24 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::7102:259:f268:5321]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::7102:259:f268:5321%7]) with mapi id 15.20.7002.014; Tue, 14 Nov 2023 10:22:23 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v3 05/33] selftests: mptcp: netlink: drop duplicate var ret Date: Tue, 14 Nov 2023 18:21:35 +0800 Message-Id: <25c1cc424dd4101365bb8cc666b8c6962c819be9.1699956980.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SG2PR06CA0190.apcprd06.prod.outlook.com (2603:1096:4:1::22) 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_|DBBPR04MB7946:EE_ X-MS-Office365-Filtering-Correlation-Id: 1c3a0351-b141-46a7-c9d1-08dbe4fb97cc X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 0iG8mgkKGDcaASsMCUaAda8fzXsrXrxYeCcKtqVcQunk8SZSCFO1+XaIX0ktnMm0r6wbAo+PJHncI4NjS8bCdIwhBiUyEq6OWS8U9Xarv4f2/OHMbJDGQa2k7pmJL2/YJdBPlHmcdiiypZNS4bqrolz+2vp/0G8SR2SIVkW4N5ISe+dUGRUKtaZpmuDX+VVLYZcraekE71HOveYM9fimRYive1PwG4v4hgsU7MIVGRRlc2iLWdEQAtkHucqrCz9Lo4lZNbOVRvH7SlOGSlwzFIw9eW+ycCuGgbASB6uOzuhVxrHUCOOTC3KF5YuNKFZBtzLYZye3twG+szI10XVigdraeOCSpqn7DpS1ivmCedt5EyC3x0Vdbwo5f1C9WhEpexSkOCWTsO0CAYg/xbYNkPsQMItdohs+fOr3abzRZrR7iSM2ndxKhdJV0q/aIZ6NuwTKRQeiZhRz7GbV0w5H1U+ou2C3DXLCEXdPMQj52bLV6i9uFo9NKcIgTtSVz50fCHYq51Si4p65mnKsXL3Ix0YCcfSCud5mAVNoyBxhcGfV4OmuGlsJG+rdhNjGWg2K 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)(396003)(346002)(376002)(366004)(39860400002)(136003)(230922051799003)(451199024)(1800799009)(64100799003)(186009)(4744005)(2906002)(44832011)(5660300002)(38100700002)(86362001)(41300700001)(2616005)(107886003)(6506007)(6666004)(6512007)(6486002)(478600001)(26005)(8676002)(8936002)(4326008)(83380400001)(66556008)(66476007)(6916009)(316002)(66946007)(36756003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?IYKGkiX+4JnQjiDotVONklSImJvIUCfWkjTfsiCf/k2ii+tZ+mpLmL+Pyyvc?= =?us-ascii?Q?YjKFbm3JFTH9lsKFbo9er673uEFWDpDZZOBNc4trDcL2q4HcMGI1K5r7vkQC?= =?us-ascii?Q?JkQmYlgXBaot6v0rx1DWMQl9ZEN6xpNldBSoL2ro649dg9xhZeK4nqdVVJ+H?= =?us-ascii?Q?mq6CMRCiuF4gcBUa+eCs//RNO7I1k+K+8U3lBB4ggyJZqrT4Nd1by96xSM5f?= =?us-ascii?Q?yYl4lPEGAvZIUXUwJz6IsibOGCECfmNJY1MwHuepp9EIjzSYYPThxeQUXITk?= =?us-ascii?Q?9O3UPnyfvxgIPxRQe2bm+bWwbBMtZkgjBfwDCoSneZsG/YOq+hyC4wnk6M8G?= =?us-ascii?Q?+Og49dbYoAWs9eaCYc79WTxhZlG5mKxhQDFKA/tMuO7pcMmSNcs3RYVhCpf+?= =?us-ascii?Q?YBE8bqLz8GZUiyx8DfI5UTwAcCr1CiIzToKbxJU3LRCToHsVbAQFxWOUBN2K?= =?us-ascii?Q?rKko2yYwCQ1Sv1APIe4wFVWMVHqX9HcQ+96DXAleIe9KCiB5tALc9EsyVceE?= =?us-ascii?Q?HY6ebvB1r2MRMx9J/ZVl38P24lvtZ+6HGiK9UB3Sds8Y71aADem0q1JdUCFe?= =?us-ascii?Q?xHje8UuWzkJaATl8ZwxA4zpYEh0vB/2WruZH5TLLcRMC9PN8v9W0X2p7tOCB?= =?us-ascii?Q?1+bBPfcPs6BZPUZwo4lH77vV3oJhVPAskNXJ9amUi4+WEwPAqmBqDn+MEUcy?= =?us-ascii?Q?bjdrUwYCgVtS03a66HDF2FuM/0WX9YLqau/m8OE8kMzuS2Gcp7kfsv0cxi81?= =?us-ascii?Q?YEHDiUSdTLjV4OAas3jDhl+tQ1WeBBXKosJp/ZkI447Ig50qsb/T7Btpmtb1?= =?us-ascii?Q?vgdTGVpHyqP0jQjT3MSUNespplrST1RkI9oQRJmmP1MDktP3tskBpmfInyTc?= =?us-ascii?Q?VR/w1Df6LJwF38wRiDUWl7Lvjh6DblsHDIr/qZELF/dVuWczaXMLRDx8rEav?= =?us-ascii?Q?ixchROn1kUansY4lXgokN0vQQAL51pYvGorTMGnWXu1EFfvuQjpd+zSLfWiM?= =?us-ascii?Q?CDP3hEWg3c/c40jK1/HjeD+2GNB1qjeZWnMI28JCpbvLIlkOq1cH04/djiru?= =?us-ascii?Q?MAv1o+eqHxvXxfiNltvM0/QKuGpWPkvIy6iM2kGLtv1sQuyqyYK4xW4geO77?= =?us-ascii?Q?M9mzdjEOEZuCI25EdPZ6I8lVyl6a8On8eOKJ0202CNKwpqIF/+E3T6odFGDr?= =?us-ascii?Q?fhtp15bsa8nnJ3+4Y7xavv+kl5sy+AABCY6gfXWBRRJI4nSG9aj+oWD2biuy?= =?us-ascii?Q?EF7THRW7dYptPk08L9NZjsVxXAs5nWv1s7RnMRfTLSUfTLcprQEaup32Birp?= =?us-ascii?Q?kt2WFoXRFMke9HElca4C8evp7H3MxV4nsGMXWhayI9O9SLxZSPE7HPjSh14u?= =?us-ascii?Q?Vd6hGA760gf6hBcyBShAq55n+8hvwjcRhMVI+nav8Dka2SYeq55JVX4BViAY?= =?us-ascii?Q?veL2aYGGvhicnS7SGikJkuy+WJ6ID8/ULCTUzxva5VAzEEzqsWtcfC0KuP/f?= =?us-ascii?Q?jC6QlqxnK+wwvnT6+LwruvdQ8QmQ81fsoUXiY0eUNbmeUnlDUeTt6H33KQCp?= =?us-ascii?Q?/vSI2DROwIoE9pyhj2qeWNeJj3AojvxCXos+ZC/0?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1c3a0351-b141-46a7-c9d1-08dbe4fb97cc X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Nov 2023 10:22:23.9290 (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: il9ic64Ku0RWiep2hDLC9Fap8w8CS5MNqPHWUz5mHxjU9AR1Ynxx2gh80ui4r5keZkXL/ymlSxPMtqsS73dVkA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR04MB7946 Content-Type: text/plain; charset="utf-8" The variable 'ret' are defined twice in pm_netlink.sh. This patch drops this duplicate one. Signed-off-by: Geliang Tang --- tools/testing/selftests/net/mptcp/pm_netlink.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/tools/testing/selftests/net/mptcp/pm_netlink.sh b/tools/testin= g/selftests/net/mptcp/pm_netlink.sh index 8d30d4a1db57..e995dfca52cc 100755 --- a/tools/testing/selftests/net/mptcp/pm_netlink.sh +++ b/tools/testing/selftests/net/mptcp/pm_netlink.sh @@ -27,7 +27,6 @@ done sec=3D$(date +%s) rndh=3D$(printf %x $sec)-$(mktemp -u XXXXXX) ns1=3D"ns1-$rndh" -ret=3D0 =20 cleanup() { --=20 2.35.3 From nobody Sat May 18 12:05:10 2024 Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on2072.outbound.protection.outlook.com [40.107.21.72]) (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 5892318C1E for ; Tue, 14 Nov 2023 10:22:33 +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="5yByXrrD" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=aHxJylhIbI236YhESvpETeuJHHS32j0TVe7samyTwTvXRcvDt6NLQ4VAgWv0i5FiXrJcE06VFcFWFQIsNFJqzRqOpnQdbwCpzNtm8SYdsOfZeugeSSllbHQAIcQ7mfMLI1RV5L2dCtqqYiup0leYTeu3WKoi7R+17uR5KnBufWowyJmjdtmYglkATnL8eTtwiTL8c77+eHIjdaDfxTN9mW5Cb5AHMRg1fU7ZzED7ZTbHQHaWyl4gumkOgHOHqcbJn+F4YeO6tL3z1WzhyHYV2I/3qvrooVnpxopsThAZGlTyQF3FzZD7xCDKWHWC3c43+BCABicRQ3SHURqVm7gaZw== 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=gsNF9dD9s5fGwqBuTg4zevfjN1o9wPo4YwgVdroR6pQ=; b=co0WIVA6ucHHYkZC8uZEI4h80ueBJncHCViqKzG6ZkmMQAsNzIWJrBAfqmYOwKKBkvjZiROQHHWNppXz6JC0Io3I0EBE8Cn5U3aheifrVdQAL1rgwUjXwvUiUQBm6TQhSpn+Ipv/5QSUDLlKfF1CIS1M5kC80bOzOP9+Mer+9JpfFDuodia1uFOnXMPbpZELarRCWt84uganbKkYjcA2+JmrWF3IOTjBZvT0jMRBjmg3nCH66Ki6hW3NCPiOxBTk5mXfFiLW4815vC3CJsmqn6WyTaDf+6C41HWKeqLNPTe86VD120cEP4EdB4QI6X1hyTBGkVtUWhz6Dnuz4XtFSA== 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=gsNF9dD9s5fGwqBuTg4zevfjN1o9wPo4YwgVdroR6pQ=; b=5yByXrrDl5SP5RC4oOsvvJAr6Psnttg1R0cx+ZBFWoL++oRv5XhzzLnohZ+BUrwsIERqogeMKccliOPDM0prhOckqbnctmK7j1mVgEF6i0u1kdJE4Cf92iiaHrcyzYfWSF7lvaaQEK+lkH8L5zYxDJDE0oXDHHtacrCzrvPHCENQuOBIyuv7LsTFOWfRQONlixmOI6nh44XWOYk1wuUOap02TtmyI+D2RMuC7IxQxsy6gS4AzdU1KRoTCKOJawtrxhsCk78AGOz2V/ogQxweVSwA4ZqWlmfjGB/S5g+4+nEsx6bymDErktf6qb5VxazLhruadl7fRbMiTK29yURGnw== 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 DBBPR04MB7946.eurprd04.prod.outlook.com (2603:10a6:10:1ec::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7002.17; Tue, 14 Nov 2023 10:22: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%7]) with mapi id 15.20.7002.014; Tue, 14 Nov 2023 10:22:30 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v3 06/33] selftests: mptcp: export ret into mptcp_lib Date: Tue, 14 Nov 2023 18:21:36 +0800 Message-Id: <3b265d8fa4eb6e4dc5e627ed7796571cdd391fe6.1699956980.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SG2PR06CA0187.apcprd06.prod.outlook.com (2603:1096:4:1::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_|DBBPR04MB7946:EE_ X-MS-Office365-Filtering-Correlation-Id: e86b540a-be3c-4a7d-aec9-08dbe4fb9b81 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: lzt/aeRcWG/O/170kD/kefH7v99UBV2Jf6Tm5Uu7k6fGClWwkG74XRCtyIs/InVQRdqvKpmDWCq75Zd0EieCp0DzE3uYSobkKMWpvrzHw0jTDDAsq/7uQIFPe05ExaFqlybAXSkfP2JexnjsIfnSG8zfdJyXI1a0KDFwRvJlz7rMQ6HxvaoamufuR2Rk2SSXx/Szp3d4ZVHyK7dZ27Eag8nWONXALetJPLE6yGY6mRsSEd66aZyPp2mA3LoVUOXR3Bcmec66r94AjCqIN5cbs2tTZ8ig33eH8q8QlXI1C9QVIU0YdiAF4TQae98ZiihWtrQlhKOadP0pz2UGUmhfhYNay9Au9BAyfjHO6nN6zOA38YhxO36b9p9hvdoJsMiInLR7/04Ml6yC8JM7IaEoXA1vsJkCax8gRQPMOGJPgZQAJrvbKEDNtNa+JPlbYhP2eu+Ph0bYE8XrnByWM1Nc+yubdoFvfyOW5V2PMpJTZgkFHSa3SGJ5UW4Yn9kBb20T2Vx7Hxt6ad0jFnJkeuUtg9D6DG61rsOaW1F35ZcYdNGF2Ws10SJ6zHuQcte95ngy 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)(396003)(346002)(376002)(366004)(39860400002)(136003)(230922051799003)(451199024)(1800799009)(64100799003)(186009)(2906002)(44832011)(5660300002)(38100700002)(86362001)(41300700001)(2616005)(107886003)(6506007)(6512007)(6486002)(478600001)(26005)(8676002)(8936002)(4326008)(83380400001)(66556008)(66476007)(6916009)(316002)(66946007)(36756003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?acvgkgHiZdmVz2I5QENuTVum7uJxp7deBz2a+M+GORE4W3K1BwGk+Az45Y/N?= =?us-ascii?Q?L+nJKhxskB4EQApljimw5KH0gDL1agj17eTNIwO4LlpZ0Ujss0zTCMBVHqli?= =?us-ascii?Q?hysGRR5oUDUiLFVN6x2O/zMDrlgQiiFRxJLnuNDFQMs7kdrCVnN89sD2z0hX?= =?us-ascii?Q?QkGwJDLu0QvLvn4sWlK76RZkm27F580jyF9wgIgofh3J+W280qrnxRgB88FW?= =?us-ascii?Q?mOhe64TPPM2fmIw+TwZ9rmwtZHS9zU9O80EttPtt+3XjJ/6uf+SmKIzgGf27?= =?us-ascii?Q?5FRWpIb2gT7eEW5eJp7rcrIXeNg2SXW1ZJtB6+9gz6CHHECbTNMMhTok63Ap?= =?us-ascii?Q?2sZ1iQ+rqIEs0/2oP0oDj96r/VslsbFhB58cLTgivkzHuDPoB40cBVMOWXzz?= =?us-ascii?Q?t/RBkOMNIn244+dSjHf3poEEgGIxknECct9WaeTjE51r792q4bObWmEQNoPz?= =?us-ascii?Q?FDOqivpHlvkrCXn5XPj41MLfm/yfFKVC9H9TQDYGFEF1h1NUk/wPHU504w4X?= =?us-ascii?Q?fVlX5tK3oox6mmIBgpGhN7hHZlTmfcqy3q4aFgXd/oenfYehxsmlz8r5wm/o?= =?us-ascii?Q?S6tgY0AI3A24SKk8zjTtO7zgIiyZ5/2fyiuaYT63TvR2HNTNOpXvwXKdP5MC?= =?us-ascii?Q?7P05fgTlx1CRedtR4nYVFCTVn+5wkA61cmToSWjGcfn5C+63Gj52j03AcyAF?= =?us-ascii?Q?trfDe674sD8fJcgVxNEzAPiblnbsB72xyeCUEHdXOeToOItH8BvNDMFsadeu?= =?us-ascii?Q?26Az1Bb8D+n7mRgo3RBk9INUn4Tbvdlq02+VM/lfyWMqOvscot2zZpGCrbLu?= =?us-ascii?Q?DPDRPOfHEzWJ1mwI+pyHFp9TMndp56XUaa+jak2X7qyBhgd5EIOqwi1N+4e8?= =?us-ascii?Q?Ne92pn4jnl8ILjeXJx48mMULQu4Uq4l//vTAnoIvYfuUujH9uhWAEWNOspNs?= =?us-ascii?Q?16Z/5hApP+TY3qJMjG87T5MdH641mYs5Zxxgm1vREd4wORiGoSCSlsbotgGN?= =?us-ascii?Q?Awn6sJ3oKGoTwdiSUoqWHvzrUYP191+eulbmqA7iLEUeVkhZtv9hRcwHfrGB?= =?us-ascii?Q?ofmLVWv2TgmmK5qDlkXGcqHeJZI4RYtmsv+5W9cg1F7Z88etiipnHjvsgQ4y?= =?us-ascii?Q?n6VQc+WokMyjRf77aobw7t7z2GEZbv49tbGq+ThQWgoMsWF9MiK8K8aAscMp?= =?us-ascii?Q?S6zaN8xSPy4J79h5lJY4lyatNWH+IUAKmTT8s4HhtSTlbu6b1FBCNM8cX/tR?= =?us-ascii?Q?wXbcAijcVNsqLRZ4ZhHzaFXPN7qXHG2jBVDrN7n/+jcliPUAqt31g5qEA9eT?= =?us-ascii?Q?TPBkIp1F6rk+8O2r6q6agBsS4OdiEbt4uDv2ONRlprgm8zSHbeXWqzzxLTqy?= =?us-ascii?Q?2XWA6uUBsyFfoHqP38fOawwQ5ntJURZym1/f3fosTnL91p/dc/6hYtTmH3f+?= =?us-ascii?Q?BbjWpgCCFDuP6fDQ7ycPkFuerkFJoskObLSs4hYJlawDiFwegIO4pS6HwNMF?= =?us-ascii?Q?ZIsti8BwfcdlQrM4D4PheBhwaxIFcqbTQboPypkFFwr9PUioBUhr2fwwMCMg?= =?us-ascii?Q?W8DSyCT4lpBOnKYPeWfhwSsWriesd8gLaRmD99SGuibs2eaIb/cywxaEebBQ?= =?us-ascii?Q?4A=3D=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: e86b540a-be3c-4a7d-aec9-08dbe4fb9b81 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Nov 2023 10:22:30.3358 (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: r+0s47PoBTIy9vc5Cfu9qjnZskwHGds1nBFn/iBnhOpukwVo/HaqNXjTLH0Xumsxs62a0oitNMblfDEDhqH3Tw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR04MB7946 Content-Type: text/plain; charset="utf-8" The variable 'ret' has been defined in every script. This patch moves it into mptcp_lib.sh as a public variable. Signed-off-by: Geliang Tang --- tools/testing/selftests/net/mptcp/diag.sh | 1 - tools/testing/selftests/net/mptcp/mptcp_connect.sh | 1 - tools/testing/selftests/net/mptcp/mptcp_join.sh | 1 - tools/testing/selftests/net/mptcp/mptcp_lib.sh | 2 ++ tools/testing/selftests/net/mptcp/mptcp_sockopt.sh | 1 - tools/testing/selftests/net/mptcp/pm_netlink.sh | 1 - tools/testing/selftests/net/mptcp/simult_flows.sh | 1 - tools/testing/selftests/net/mptcp/userspace_pm.sh | 1 - 8 files changed, 2 insertions(+), 7 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/diag.sh b/tools/testing/self= tests/net/mptcp/diag.sh index ab62737bd501..300aec419dd6 100755 --- a/tools/testing/selftests/net/mptcp/diag.sh +++ b/tools/testing/selftests/net/mptcp/diag.sh @@ -10,7 +10,6 @@ ksft_skip=3D4 test_cnt=3D1 timeout_poll=3D100 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 98f4e82789ba..5e28292e1889 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_connect.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_connect.sh @@ -6,7 +6,6 @@ time_start=3D$(date +%s) =20 optstring=3D"S:R:d:e:l:r:h4cm:f:tC" -ret=3D0 final_ret=3D0 sin=3D"" sout=3D"" diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index c5cdb8b1643b..1ba49a668eb1 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -12,7 +12,6 @@ =20 . "$(dirname "${0}")/mptcp_lib.sh" =20 -ret=3D0 sin=3D"" sinfail=3D"" sout=3D"" diff --git a/tools/testing/selftests/net/mptcp/mptcp_lib.sh b/tools/testing= /selftests/net/mptcp/mptcp_lib.sh index 4f741725436c..88ea621e7df5 100644 --- a/tools/testing/selftests/net/mptcp/mptcp_lib.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_lib.sh @@ -8,6 +8,8 @@ readonly KSFT_SKIP=3D4 # shellcheck disable=3DSC2155 # declare and assign separately readonly KSFT_TEST=3D$(basename "${0}" | sed 's/\.sh$//g') =20 +ret=3D0 + 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/mptcp_sockopt.sh b/tools/tes= ting/selftests/net/mptcp/mptcp_sockopt.sh index 75d8c648f9de..45e5b5810a6a 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh @@ -3,7 +3,6 @@ =20 . "$(dirname "${0}")/mptcp_lib.sh" =20 -ret=3D0 sin=3D"" sout=3D"" cin=3D"" diff --git a/tools/testing/selftests/net/mptcp/pm_netlink.sh b/tools/testin= g/selftests/net/mptcp/pm_netlink.sh index e995dfca52cc..75c7594dbd71 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 23f5bc0aeaf2..3536c7160ce5 100755 --- a/tools/testing/selftests/net/mptcp/simult_flows.sh +++ b/tools/testing/selftests/net/mptcp/simult_flows.sh @@ -13,7 +13,6 @@ ksft_skip=3D4 timeout_poll=3D30 timeout_test=3D$((timeout_poll * 2 + 1)) test_cnt=3D1 -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 0614611b7821..7de2ca99edbd 100755 --- a/tools/testing/selftests/net/mptcp/userspace_pm.sh +++ b/tools/testing/selftests/net/mptcp/userspace_pm.sh @@ -54,7 +54,6 @@ sec=3D$(date +%s) rndh=3D$(printf %x "$sec")-$(mktemp -u XXXXXX) ns1=3D"ns1-$rndh" ns2=3D"ns2-$rndh" -ret=3D0 TEST_NAME=3D"" =20 _printf() { --=20 2.35.3 From nobody Sat May 18 12:05:10 2024 Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on2061.outbound.protection.outlook.com [40.107.21.61]) (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 91B3618C39 for ; Tue, 14 Nov 2023 10:22:40 +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="Qgrr4klE" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PySY6awW5qak31h1GAUo/4vlc5mzoZHGKHWae7jpXQYR1MD0D0RrGfg2cpP6XlBUZwGEUdHKDwH3qmHqoHn9B2V1ImWxxN0JDJJskVBG9oeb++66kbtyfMY+jIJMhoFlZCjiQbgP8zhnwSZVG3Fmc11YBJw0ytYmece27WXEhcP4QnmXcgAaphGPrdv6EJkbpbzCSBLoc8XVDWxhRj50JXxYyP/qlq5VCOi7tmUbAMNmTlYNggxZrJOy7vkxP60ZCFruTToKJi5lYoXBQePHi9EM9mQVmwGFZZ+O/WxIdT/N07flsxGeJS/Vcqa6RzFfzXWFj/NDtK+AbFwoqL5zxw== 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=gvNMoWxeIJtaEInpK0iT0VR1O0bULxCyHqMobB0bfF8=; b=fqEVr+FvRMroC3QdfvXaZuSN9fQtabj/hKJbldrPSSZDgOkgS5NW8Q/X0tJR678U8g4jYT/CJx2AWuIUYVdC6OnkvlLIj+lqwhuwQgnPoJlNBLYFWJFjnhMN0Rn9I9mRvyYk0Fls/Vyx8Pt5yFF6Hqn/ZO1CXozM0K5cgd+/lx1BYKO/pJJgv01dF7L9QpWPyvGMnZVf+Jeheyhh7WM7KJxW4Bw36Rrjm9h6nH+qVwHlXbVJ03QbdSDJ0twRtTWHfVycSK81K6vEqJhYwhitqk+s/ehu/tyJ5h/5NhT0hfkRM9FpTybAkGLCkD+vjEiGpAfAb6U/LFxgJUQ35ZIZQw== 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=gvNMoWxeIJtaEInpK0iT0VR1O0bULxCyHqMobB0bfF8=; b=Qgrr4klEWaZxfMOGnlnnHVzEE+USB/1lPn3nRE5MSk8hMk/SU1YSiHzg/xp1ej2RXmlc4DfXSNMW/p7wyyhW2a4lvcqtZD5gpszLGLzEsHRE+2AP//LB1P0d4KUokwCFiSuw5nsgTxCWqaDrd8Isil4yHrIYVHTcPMJu6mTdj+wVTOgsqmC4o+e47s6QxzJ7SQKYtGMpnvTx6Rqq99Gx7/gcGRZoHNbJfkXxRYZlKxHOtRHODvK4N2sC3qiLCB07RoN1dsFrhBpuuHCd65cnv54XEkEF5rrOJUsijjQrdBOOoaw5Pfsq+IRtSpDcH+KCeB7AzPMwYTe6HtURjSamqg== 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 DBBPR04MB7946.eurprd04.prod.outlook.com (2603:10a6:10:1ec::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7002.17; Tue, 14 Nov 2023 10:22:37 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::7102:259:f268:5321]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::7102:259:f268:5321%7]) with mapi id 15.20.7002.014; Tue, 14 Nov 2023 10:22:37 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v3 07/33] selftests: mptcp: extract mptcp_lib_check_expected Date: Tue, 14 Nov 2023 18:21:37 +0800 Message-Id: X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TYCP286CA0110.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:29c::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_|DBBPR04MB7946:EE_ X-MS-Office365-Filtering-Correlation-Id: 5d3edded-68c7-4a99-eb77-08dbe4fba011 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: lZDd7Nch9gxgl2599Dk9ILU5MCwdP3Y9QkAYait+BCZPFWakrVT//6V9JgFcv256mR4lwlMjviIwYGHOtATcudcMi7lsKK3nJYL/IqEDPmHhZvr3VplXWVEt/IDgTIDrHik2I/vZND5ibNggRb++hBZKXtDd9X2NrIaGzYfY9xMyNpjvGzRmZp9uO4zjuVpHjtbp5M194DdUDUbmBkg09P+RYFxIAtSWBZvSmY7uXWAza0z82cLB8UUQvfJW40q5/Q19T+AXK+c7K3TuC426J9DLT86gC/A6AFrrp5uSXuU5ljNwVkogfUu51UoQD9ZFWGlC9cmT4gwJTL1NypL1dJPtSy7abVtLJw7FJ62/o1foufFGq99WqgRwU64D8YXGL/FxmVBpQvpYuqm8GkTeGlW0n/u0ttXaIkvMMeJYg9swkH6SY2bebx0N45dRMogq9JJ0mZEr2feuiFhF74XDKie9tqGmnJiTbaDygwwM5BgZYZNmR4pNaBljvU7YLQdoLyTWbWCV5FEa8xiRldEvc5YaTBXc4OmUMt6GTh8hcNhhFcljq+GrKhznv0MhOulT 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)(396003)(346002)(376002)(366004)(39860400002)(136003)(230922051799003)(451199024)(1800799009)(64100799003)(186009)(2906002)(44832011)(5660300002)(38100700002)(86362001)(41300700001)(2616005)(107886003)(6506007)(6512007)(6486002)(478600001)(26005)(8676002)(8936002)(4326008)(83380400001)(66556008)(66476007)(6916009)(316002)(66946007)(36756003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?xzsdczkUKiRjUOyuwKSRc2nvG7JogeBs93lQT5QRxiDanGtGgFQopVcwB2G1?= =?us-ascii?Q?ufTE7mfpJMJYXotmXnBIy0LEs5uG2kWcn6+O1jYF7vsOHtqP7isLbHYWfRGf?= =?us-ascii?Q?4HU4DRCpTiK2jjTbzIizXYTDHeuBATUFklzZQbx/pfDMVlqIOnB9uJEP4L+U?= =?us-ascii?Q?8n1s+w8XrwhAQJ1zaHKwwBKe5m/z8AtKT5IHLqNj5n3J1mkCUB2w/wJoVvBV?= =?us-ascii?Q?8mrd5CoiQvCNjBpXxJAaO9fuF/q1ge79PI4JQQZJsxdQcLH/GsXHvlE/Ow/O?= =?us-ascii?Q?0yanjXb3ELC+UJXQm6keMdk9+ahOkSfO2/W42tE6YOakUvt4PWfG7OROS6IE?= =?us-ascii?Q?QTeqxlgv8mA8+ryMKAl8m3YnrktyfyldRP1PZHnji9r7TizCZ0NHfm0T0uVe?= =?us-ascii?Q?EDVS62sRHjcMLQQpJWI9hMp+bc/pKg7g50jvqvoxZKnr09+J0E18FxA38qVZ?= =?us-ascii?Q?S/KD+Kji0mAgJqoM5pIJ+pvzojCOVbX6Bed8Z1cAtQl6yZLSpZpUSge0Hlia?= =?us-ascii?Q?LfDaCAbdJ0nZCtR+1DqFL7tx/2JOwYW7gAc2rhe9qhYtHJ5g+wUxIC09CSzb?= =?us-ascii?Q?JXBMcRjessLSStHvQypW7rFaIYSwEopx1isUw3YCclK115rhrUvGrj9vnnXE?= =?us-ascii?Q?O8F/s8qiouL0Qtg/t+EX3izrBQLFA73L4vOmuFsjpS06stndLm/b8gRhplrN?= =?us-ascii?Q?6lvhvQbMARpQ8ZpLred5enQjnF2+hB9isKiIueH1mA9kk8o8ASQ5/Fgv3Cdt?= =?us-ascii?Q?Pl+ed0b47ZKW8yvWBENGANBCt0JRVriuALOWUf85p0H4D6kYT629y2o+tiED?= =?us-ascii?Q?tqJLOLwMsuxEuTHjwGjNj8pmNjb1mCnz/cLuOtzdTtIQwsGkqW8gGvZRdOyW?= =?us-ascii?Q?rMOlNk/rM1i/tfzRo2czIGYuKqitayqDmJA7qsrVo+BW9Yds7OPGPqxcBAcu?= =?us-ascii?Q?2447Y8FSMupgpx3ohQs8Wkkr/H6JJfE3KNHGZUC5Wl/SdBLWEFdE7Nspm0gJ?= =?us-ascii?Q?OCD9gRilcFS4e2O5KbfX3k1kEjU1B3nqJBFCEwljltMc0dnt9up/UHoE6Yf6?= =?us-ascii?Q?phJ75/LPtfWF/2iXdX40bi3tbSlHNg9wQO05sF543Q1t1Ujv0J3P9L7Hw3tb?= =?us-ascii?Q?SfwqU/knw5RIxQBJ/3L4CmFmWgWz0G51C7Ah+oKPO6l4u1E/qHsP/CY33aO3?= =?us-ascii?Q?Y4lAaXaj/UOVPX+jw1Jd7VdqpwrK0JiOG89vGxG/OL3xiOe8rIIxS/q5pwd2?= =?us-ascii?Q?gLpPVQA5h8uWkuJF8CKDTKi5Pc5sEzXX1M7QvAVizK/Cn3LtdbDIeHGwTTcz?= =?us-ascii?Q?Qord75SKPFJ3um4b2Zp1v7L3T2H2MKdj9p9JF1ZJuzkhVRwovRWbAYYJ4FwP?= =?us-ascii?Q?N20GXRNkwerPhr1Z6TG4MAe+T9ZWpgV+IUwP8TVAmo6Gv2kunZtuNO/C+H1D?= =?us-ascii?Q?nVJ6VZ4mOh//4b/4Srz76Az9qgS3w9MijMbQ0w94oJlLOPBt1fGuYxRrCS8N?= =?us-ascii?Q?oy7EcI0Z+/aj4fuXdigWvrdkWj3KvXmJOdZVaXILClU/TTOmWYjtfq0Hx0JU?= =?us-ascii?Q?Gneo7O84BjHgfbU6NoA95TOrOMycJO7j2FlQkAOHbmP5Ktc9wfcuof3j4dPk?= =?us-ascii?Q?IA=3D=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5d3edded-68c7-4a99-eb77-08dbe4fba011 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Nov 2023 10:22:37.8131 (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: VkAPYqUXE7OGXzK3sTi2XnwMOJPjkxZcRYliBBw7bajNbgDjauetIUwTVlGgrqd78AHep2hmZ69c9vR6au5pKg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR04MB7946 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 88ea621e7df5..3d23783dc307 100644 --- a/tools/testing/selftests/net/mptcp/mptcp_lib.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_lib.sh @@ -391,6 +391,48 @@ mptcp_lib_evts_remove() { rm -rf "${server_evts}" "${client_evts}" } =20 +# $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 +} + mptcp_lib_cleanup() { echo "cleanup" diff --git a/tools/testing/selftests/net/mptcp/userspace_pm.sh b/tools/test= ing/selftests/net/mptcp/userspace_pm.sh index 7de2ca99edbd..a85eb83a61f8 100755 --- a/tools/testing/selftests/net/mptcp/userspace_pm.sh +++ b/tools/testing/selftests/net/mptcp/userspace_pm.sh @@ -237,46 +237,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 12:05:10 2024 Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on2064.outbound.protection.outlook.com [40.107.21.64]) (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 CDD9A16412 for ; Tue, 14 Nov 2023 10:22:48 +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="3Woyv2le" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JpDeVbG8XOvT8k9leYHtE68BU4Ex9RXx9F70CY1EJGtB74nBhHqwP35fJxixUanzImRlEt2hQ9r2J8SKosyq49a66efQSUcZf0JPAysCzv8Qk25lBhfV++XeMTbpLBFl4sTPd+2Ep9TnSZTpPHTCf6q6IX2featkR32ey1Pqzradg+h3gwMF7NsTkTq/C3bc7+Cx02SZagdLv34G9pD7+AaNjI7m7UcfoF92kp+U/XaD25QVdpb5emeZelRtXlUphK2EOlxf2dPBL8eJjhkFxGpl0Ev0d6Gw++GhUyRpj5b+qH0zy8HZS1xC4keuZ5G8eo73qQNLfsw+ZbGIYxYFIQ== 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=Q/DzQHWnLi1Pc8Ohf67nCSZUKw9WMTLckVkpqgDw720=; b=bwo5J4h4+HzDRyBg3e/IWeXsez6dXaSaPauwD9upSfsdsf3hic4ASRlKjRSTh0wFL2X0TzKkJ5a2yMXIf5H2v29qBmDK3qjRKSkLYXeqrYjIrOfA9cbz31B1ApFTJ4rApZkKKK9JvsVwW7Z0yISVA4vo+cfJQquzm2wTYWXT2kVgKgv0JI548uopU9OMLNhMoewGCmnBMb+VTVfRIU8V7yP8xb/Yhy2eieJK1KsNmF1+7I6T8TIB5XZnUEIN5Vjda620H0MQ/k4jGQWGm7VbY02Yi1l7WjG0YzTcc+5Yp/E2+PUzQvsoKwLnRnRF7lQ2kb6kze6aA6+Qw/9qTxnxtw== 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=Q/DzQHWnLi1Pc8Ohf67nCSZUKw9WMTLckVkpqgDw720=; b=3Woyv2le2GWzdSBB2gHliTyDgOfdn23dZI9S5o6MYswebUXrAXK6IGxmSmqHkWAnwlTCTJtppjj0gv87/iOKfHcYQJyPU74oClyD8EXWLIONW5dy2QZsycEJL3uGupGgPgKn1EDgKyn/pomokqqFVvA3ph5JygV2gH5G/Mc/JGYsWqaTgBzz5iQyy9viNrFeP0kTZ0nl4kW9k1y0i9uRmIoxAqtweq4VgtWcr5mPQs0eczpRXKuG9QrH2sYVYao0K3VFcZ+Ni0oGyBXOTlh5nT5iUvJrXPXHnw/huCQCemaZFMJ7pApb+DNwuKDFVyWQDxqA05xrARAc8+iYV13+3g== 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 DBBPR04MB7946.eurprd04.prod.outlook.com (2603:10a6:10:1ec::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7002.17; Tue, 14 Nov 2023 10:22:45 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::7102:259:f268:5321]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::7102:259:f268:5321%7]) with mapi id 15.20.7002.014; Tue, 14 Nov 2023 10:22:45 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v3 08/33] selftests: mptcp: export event macros in mptcp_lib Date: Tue, 14 Nov 2023 18:21:38 +0800 Message-Id: X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TYCP286CA0111.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:29c::16) 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_|DBBPR04MB7946:EE_ X-MS-Office365-Filtering-Correlation-Id: 171fd931-d072-4c0e-9ed2-08dbe4fba498 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: xxT+4roLn5daRcs5TNGFcAEKwqWmZdh7qg+i41eUWOM2qPFULawlk48MnzFXk+xJC+uWYuyqBcoIJIjKpglptHq7XxkbFVk3sbkpY1L3xZmBQGzMYnuXv855U7pE1zjIh/m5xIPQe3W4b2mrrbJ/OMDsbAObbFd1lM1raSAPqpFOxTAtK0AarymE/zWXdIIgI18uVW1SfvuEpsQa8WQQBxV2GOzmNHUjZ+6qFPnsloAa+bOBZR7tGqhw/yIlH+xJ4JHHNag7BODhyF1FnFUupbxsShhAb4BrGfSFTX4YFi30/6AOOJO7Io3oInO1GVAdQI3krQBASS9N7y8s/vYkrhJezOVRWhj8oTWcZuEE1ITiWTj3Gh5XcawKEFhfevbVdQwDyW0fvMWTImy6tLEzcqu1w6ym7rf++V+MouBoofmZeAhMpAqG7jOcN72lC5/0lxSbbbb3uAC5ZOwiJ0xoZuBON0XX0PVXgWL0g+iSKfX0rWlVav4PIkwUL1/r+XZjjtfC9uoE09Y4WSPe78o8ghH/pU87aAsN1tHGqlnRrRBXIPIARInP0qibczydyYKX 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)(396003)(346002)(376002)(366004)(39860400002)(136003)(230922051799003)(451199024)(1800799009)(64100799003)(186009)(30864003)(2906002)(44832011)(5660300002)(38100700002)(86362001)(41300700001)(2616005)(107886003)(6506007)(6666004)(6512007)(6486002)(478600001)(26005)(8676002)(8936002)(4326008)(83380400001)(66556008)(66476007)(6916009)(316002)(66946007)(36756003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?ZRWvAbbLqz/2oe07uuXsCbqJLcCNEROX+ptPGP7MpGAGrJqqyfw26e2y+C4d?= =?us-ascii?Q?ke7ac0Fr0zoAjC2fvc8lc6ony5tBTRU83OczoGQaAYSz3QmL0xWD7EdWpAvd?= =?us-ascii?Q?DtsVmQ7f8z7gNuRMG/jzWMUmDVhe+JQSGTnd9T75B54ThEbijVMx6j/5ytWX?= =?us-ascii?Q?UkX+Nu/X+R1AsIrBDmN4cDZOEc8MpxGAe/vOZhjscdA0cgjRh46LEAXpEUBc?= =?us-ascii?Q?arIWu+HIynseWS/LJ79+WeroeYR4jAKgMqn3sghxO+2CLIe6v1qdoC+hd0pD?= =?us-ascii?Q?PHzxVaAIa5qljPTiijRjlokLBMqc8Xi0E8S7YwSILmxQNEgHqEttQHylVCLv?= =?us-ascii?Q?zdF9+LOhAGJ67kuuL+pyW2UeK5kiyVLDoit32vh9EPO1q4SD9ed1wGAYTYsh?= =?us-ascii?Q?MNrzl9TbuP2vV3kx2Er5KaIFxJkFJxqBBIAgXeucP9Q6J4QxXjbRf9gW6a5h?= =?us-ascii?Q?q54REj9+bsr+j4PAmIR9v5GLvQLtx0uWb7GZI7tdUr+d6T4LR3E1CMr7FwuU?= =?us-ascii?Q?SBDGR3gAfxPbEcSf6wFyHxoQOGvR27KwD7L8WJdarOq7/pggXYL9p1OViEKO?= =?us-ascii?Q?8vSUI1yGyGb1Wz1OaKaTAH0jFvlcbbPVnv8iRQt4LzfUJDq4cT6lAjNnjaeu?= =?us-ascii?Q?/PHRzNSdHwDvhhhrPwRQ6RPm+YS3yIb7ApDlnB7XAyvEBHvfM1K2FAT5Jc5s?= =?us-ascii?Q?n6PaG99EISf5jun+vRqdAh4nuE2yyGIR804KPCJ8GGiJoyPfvDHHdHKK4tY0?= =?us-ascii?Q?k2M8a4o7vgs7vNrM9FcxatQrG65X0iY9WRefSdjgJ0WDVKtZYKgHLq7VWbps?= =?us-ascii?Q?QvZ6Q0JUbxqh5wzszcYhMh9njsG+M4uzCekweo+uXccQZHt0KI+CSaH78nd5?= =?us-ascii?Q?Tzi/Ewrk0Ioq8VxumyiTe43aiji8Rr48yGkr6+nRIww7TzEgXOVS5Q55WE2j?= =?us-ascii?Q?QAdJ/TVC1K9A232kQRgk0/MmU6M5dVLJdG+nEtvAMqkQYph+xLXA144RAbKO?= =?us-ascii?Q?W1IK2E82NJKuNb6ds4LGkgox2RPsCn3KnaiJVQESVlCYW0bmKoEq4jj8EHzS?= =?us-ascii?Q?PNJZySmp9R9HWTDw2C8g90UNZDHg/10E8MIFk2AP+zq6/mz5AY7mTPNsf9MW?= =?us-ascii?Q?PisCvzfFMJ1mIyblyqLJpIB1MgT0JNrVruvn2OG55UwWtYVy51kF8gGS8gKT?= =?us-ascii?Q?qBnEn6/81BamHcP7VhNI1Et6THa5Ov5RyA4yF2L60RpXIZelLjHNIC69VsbJ?= =?us-ascii?Q?r1qTi3KhHGQWAuqo4EIix3wQmb+MCT/M7AYnQFKFUiOL6gvHsghpA2WO4UO9?= =?us-ascii?Q?hauVMrYYy28E3I1AdRT7qFc8kwt++9qrEFTHahFzZJhnM2R0VazbFZ0fm6TY?= =?us-ascii?Q?qMn1UIIh1KIPYzSKY7dXdISRsO1T3MAOONZXzcDlcDNcxbEYflSL0q0xHpGk?= =?us-ascii?Q?wfexXaVJmvRnTiRHULTcLgSL/se+uxrOtGIiQN8A1qgppyhncASbtXT1GRD7?= =?us-ascii?Q?MXysjejsVCAyfJH5aF8mn824GwIr426mMVJrYwcu10B6vezxCEJuUSOT2ony?= =?us-ascii?Q?ocxIhnA0MSTUqThQ73iirFv+ThBaUXX9YKbrH9xqiFrf/1fzjFU1+sMFpVEc?= =?us-ascii?Q?7w=3D=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 171fd931-d072-4c0e-9ed2-08dbe4fba498 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Nov 2023 10:22:45.6749 (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: PQzCTPZvjijEgZLVmGXj7ICpfOAH+cUdTudrB9/i6XfvhM83li9pHfvh4ae9IaEjUERYRKA8YULBOds2u9Anog== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR04MB7946 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 all event macros 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 | 10 ++ .../selftests/net/mptcp/userspace_pm.sh | 121 +++++++++--------- 3 files changed, 78 insertions(+), 74 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index 1ba49a668eb1..1c3df7831855 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 @@ -3397,7 +3392,7 @@ userspace_tests() chk_subflows_total 2 2 chk_mptcp_info add_addr_signal 1 add_addr_accepted 1 local rm_addr=3D"userspace_pm_rm_addr $ns1 10" - local rm_sf=3D"userspace_pm_rm_sf $ns1 ::ffff:10.0.2.1 $SUB_ESTABLISHED" + local rm_sf=3D"userspace_pm_rm_sf $ns1 ::ffff:10.0.2.1 $MPTCP_LIB_SUB_ES= TABLISHED" if [ $((RANDOM%2)) -eq 0 ]; then $($rm_addr); $($rm_sf) else @@ -3426,7 +3421,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 3d23783dc307..accd3a62832e 100644 --- a/tools/testing/selftests/net/mptcp/mptcp_lib.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_lib.sh @@ -10,6 +10,16 @@ readonly KSFT_TEST=3D$(basename "${0}" | sed 's/\.sh$//g= ') =20 ret=3D0 =20 +MPTCP_LIB_ANNOUNCED=3D6 # MPTCP_EVENT_ANNOUNCED +MPTCP_LIB_REMOVED=3D7 # MPTCP_EVENT_REMOVED +MPTCP_LIB_SUB_ESTABLISHED=3D10 # MPTCP_EVENT_SUB_ESTABLISHED +MPTCP_LIB_SUB_CLOSED=3D11 # MPTCP_EVENT_SUB_CLOSED +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 a85eb83a61f8..2e9fba4e07ac 100755 --- a/tools/testing/selftests/net/mptcp/userspace_pm.sh +++ b/tools/testing/selftests/net/mptcp/userspace_pm.sh @@ -23,16 +23,6 @@ if ! ip -Version &> /dev/null; then exit ${KSFT_SKIP} 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 - file=3D"" client4_pid=3D0 server4_pid=3D0 @@ -306,8 +296,8 @@ test_announce() ns2eth1 print_test "ADD_ADDR id:${client_addr_id} 10.0.2.2 (ns2) =3D> ns1, reuse = port" sleep 0.5 - verify_announce_event $server_evts $ANNOUNCED $server4_token "10.0.2.2" $= client_addr_id \ - "$client4_port" + verify_announce_event $server_evts $MPTCP_LIB_ANNOUNCED $server4_token \ + "10.0.2.2" $client_addr_id "$client4_port" =20 # ADD_ADDR6 from the client to server machine reusing the subflow port :>"$server_evts" @@ -315,8 +305,8 @@ test_announce() dead:beef:2::2 token "$client6_token" id $client_addr_id dev ns2eth1 print_test "ADD_ADDR6 id:${client_addr_id} dead:beef:2::2 (ns2) =3D> ns1,= reuse port" sleep 0.5 - verify_announce_event "$server_evts" "$ANNOUNCED" "$server6_token" "dead:= beef:2::2"\ - "$client_addr_id" "$client6_port" "v6" + verify_announce_event "$server_evts" "$MPTCP_LIB_ANNOUNCED" "$server6_tok= en" \ + "dead:beef:2::2" "$client_addr_id" "$client6_port" "v6" =20 # ADD_ADDR from the client to server machine using a new port :>"$server_evts" @@ -325,7 +315,7 @@ test_announce() $client_addr_id dev ns2eth1 port $new4_port print_test "ADD_ADDR id:${client_addr_id} 10.0.2.2 (ns2) =3D> ns1, new po= rt" sleep 0.5 - verify_announce_event "$server_evts" "$ANNOUNCED" "$server4_token" "10.0.= 2.2"\ + verify_announce_event "$server_evts" "$MPTCP_LIB_ANNOUNCED" "$server4_tok= en" "10.0.2.2"\ "$client_addr_id" "$new4_port" =20 # Capture events on the network namespace running the client @@ -336,7 +326,7 @@ test_announce() $server_addr_id dev ns1eth2 print_test "ADD_ADDR id:${server_addr_id} 10.0.2.1 (ns1) =3D> ns2, reuse = port" sleep 0.5 - verify_announce_event "$client_evts" "$ANNOUNCED" "$client4_token" "10.0.= 2.1"\ + verify_announce_event "$client_evts" "$MPTCP_LIB_ANNOUNCED" "$client4_tok= en" "10.0.2.1"\ "$server_addr_id" "$app4_port" =20 # ADD_ADDR6 from the server to client machine reusing the subflow port @@ -345,8 +335,8 @@ test_announce() $server_addr_id dev ns1eth2 print_test "ADD_ADDR6 id:${server_addr_id} dead:beef:2::1 (ns1) =3D> ns2,= reuse port" sleep 0.5 - verify_announce_event "$client_evts" "$ANNOUNCED" "$client6_token" "dead:= beef:2::1"\ - "$server_addr_id" "$app6_port" "v6" + verify_announce_event "$client_evts" "$MPTCP_LIB_ANNOUNCED" "$client6_tok= en" \ + "dead:beef:2::1" "$server_addr_id" "$app6_port" "v6" =20 # ADD_ADDR from the server to client machine using a new port :>"$client_evts" @@ -355,7 +345,7 @@ test_announce() $server_addr_id dev ns1eth2 port $new4_port print_test "ADD_ADDR id:${server_addr_id} 10.0.2.1 (ns1) =3D> ns2, new po= rt" sleep 0.5 - verify_announce_event "$client_evts" "$ANNOUNCED" "$client4_token" "10.0.= 2.1"\ + verify_announce_event "$client_evts" "$MPTCP_LIB_ANNOUNCED" "$client4_tok= en" "10.0.2.1"\ "$server_addr_id" "$new4_port" } =20 @@ -416,7 +406,7 @@ test_remove() $client_addr_id print_test "RM_ADDR id:${client_addr_id} ns2 =3D> ns1" sleep 0.5 - verify_remove_event "$server_evts" "$REMOVED" "$server4_token" "$client_a= ddr_id" + verify_remove_event "$server_evts" "$MPTCP_LIB_REMOVED" "$server4_token" = "$client_addr_id" =20 # RM_ADDR from the client to server machine :>"$server_evts" @@ -425,7 +415,7 @@ test_remove() $client_addr_id print_test "RM_ADDR id:${client_addr_id} ns2 =3D> ns1" sleep 0.5 - verify_remove_event "$server_evts" "$REMOVED" "$server4_token" "$client_a= ddr_id" + verify_remove_event "$server_evts" "$MPTCP_LIB_REMOVED" "$server4_token" = "$client_addr_id" =20 # RM_ADDR6 from the client to server machine :>"$server_evts" @@ -433,7 +423,7 @@ test_remove() $client_addr_id print_test "RM_ADDR6 id:${client_addr_id} ns2 =3D> ns1" sleep 0.5 - verify_remove_event "$server_evts" "$REMOVED" "$server6_token" "$client_a= ddr_id" + verify_remove_event "$server_evts" "$MPTCP_LIB_REMOVED" "$server6_token" = "$client_addr_id" =20 # Capture events on the network namespace running the client :>"$client_evts" @@ -443,7 +433,7 @@ test_remove() $server_addr_id print_test "RM_ADDR id:${server_addr_id} ns1 =3D> ns2" sleep 0.5 - verify_remove_event "$client_evts" "$REMOVED" "$client4_token" "$server_a= ddr_id" + verify_remove_event "$client_evts" "$MPTCP_LIB_REMOVED" "$client4_token" = "$server_addr_id" =20 # RM_ADDR from the server to client machine :>"$client_evts" @@ -452,7 +442,7 @@ test_remove() $server_addr_id print_test "RM_ADDR id:${server_addr_id} ns1 =3D> ns2" sleep 0.5 - verify_remove_event "$client_evts" "$REMOVED" "$client4_token" "$server_a= ddr_id" + verify_remove_event "$client_evts" "$MPTCP_LIB_REMOVED" "$client4_token" = "$server_addr_id" =20 # RM_ADDR6 from the server to client machine :>"$client_evts" @@ -460,7 +450,7 @@ test_remove() $server_addr_id print_test "RM_ADDR6 id:${server_addr_id} ns1 =3D> ns2" sleep 0.5 - verify_remove_event "$client_evts" "$REMOVED" "$client6_token" "$server_a= ddr_id" + verify_remove_event "$client_evts" "$MPTCP_LIB_REMOVED" "$client6_token" = "$server_addr_id" } =20 verify_subflow_events() @@ -489,7 +479,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 @@ -546,22 +536,24 @@ 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" ip netns exec "$ns1" ./pm_nl_ctl dsf lip 10.0.2.1 lport "$sport" rip 10.0= .2.2 rport\ "$client4_port" token "$server4_token" sleep 0.5 - verify_subflow_events "$server_evts" "$SUB_CLOSED" "$server4_token" "$AF_= INET" "10.0.2.1"\ - "10.0.2.2" "$client4_port" "23" "$client_addr_id" "ns1" "ns2" + verify_subflow_events "$server_evts" "$MPTCP_LIB_SUB_CLOSED" "$server4_to= ken" \ + "$AF_INET" "10.0.2.1" "10.0.2.2" "$client4_port" "23" \ + "$client_addr_id" "ns1" "ns2" =20 # RM_ADDR from client to server machine ip netns exec "$ns2" ./pm_nl_ctl rem id $client_addr_id token\ @@ -584,21 +576,21 @@ 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" ip netns exec "$ns1" ./pm_nl_ctl dsf lip dead:beef:2::1 lport "$sport" ri= p\ dead:beef:2::2 rport "$client6_port" token "$server6_token" sleep 0.5 - verify_subflow_events "$server_evts" "$SUB_CLOSED" "$server6_token" "$AF_= INET6"\ + verify_subflow_events "$server_evts" "$MPTCP_LIB_SUB_CLOSED" "$server6_to= ken" "$AF_INET6"\ "dead:beef:2::1" "dead:beef:2::2" "$client6_port" "23"\ "$client_addr_id" "ns1" "ns2" =20 @@ -623,22 +615,23 @@ 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" ip netns exec "$ns1" ./pm_nl_ctl dsf lip 10.0.2.1 lport "$sport" rip 10.0= .2.2 rport\ $new4_port token "$server4_token" sleep 0.5 - verify_subflow_events "$server_evts" "$SUB_CLOSED" "$server4_token" "$AF_= INET" "10.0.2.1"\ - "10.0.2.2" "$new4_port" "23" "$client_addr_id" "ns1" "ns2" + verify_subflow_events "$server_evts" "$MPTCP_LIB_SUB_CLOSED" "$server4_to= ken" \ + "$AF_INET" "10.0.2.1" "10.0.2.2" "$new4_port" "23" \ + "$client_addr_id" "ns1" "ns2" =20 # RM_ADDR from client to server machine ip netns exec "$ns2" ./pm_nl_ctl rem id $client_addr_id token\ @@ -662,21 +655,22 @@ 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" ip netns exec "$ns2" ./pm_nl_ctl dsf lip 10.0.2.2 lport "$sport" rip 10.0= .2.1 rport\ $app4_port token "$client4_token" sleep 0.5 - verify_subflow_events "$client_evts" "$SUB_CLOSED" "$client4_token" "$AF_= INET" "10.0.2.2"\ - "10.0.2.1" "$app4_port" "23" "$server_addr_id" "ns2" "ns1" + verify_subflow_events "$client_evts" "$MPTCP_LIB_SUB_CLOSED" "$client4_to= ken" \ + "$AF_INET" "10.0.2.2" "10.0.2.1" "$app4_port" "23" \ + "$server_addr_id" "ns2" "ns1" =20 # RM_ADDR from server to client machine ip netns exec "$ns1" ./pm_nl_ctl rem id $server_addr_id token\ @@ -699,7 +693,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" @@ -707,15 +701,16 @@ 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" ip netns exec "$ns2" ./pm_nl_ctl dsf lip dead:beef:2::2 lport "$sport" ri= p\ dead:beef:2::1 rport $app6_port token "$client6_token" sleep 0.5 - verify_subflow_events $client_evts $SUB_CLOSED $client6_token $AF_INET6 "= dead:beef:2::2"\ - "dead:beef:2::1" "$app6_port" "23" "$server_addr_id" "ns2" "ns1" + verify_subflow_events $client_evts $MPTCP_LIB_SUB_CLOSED $client6_token \ + $AF_INET6 "dead:beef:2::2" "dead:beef:2::1" "$app6_port" \ + "23" "$server_addr_id" "ns2" "ns1" =20 # RM_ADDR6 from server to client machine ip netns exec "$ns1" ./pm_nl_ctl rem id $server_addr_id token\ @@ -738,21 +733,23 @@ 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" ip netns exec "$ns2" ./pm_nl_ctl dsf lip 10.0.2.2 lport "$sport" rip 10.0= .2.1 rport\ $new4_port token "$client4_token" sleep 0.5 - verify_subflow_events "$client_evts" "$SUB_CLOSED" "$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_CLOSED" "$client4_to= ken" \ + "$AF_INET" "10.0.2.2" "10.0.2.1" "$new4_port" "23" \ + "$server_addr_id" "ns2" "ns1" =20 # RM_ADDR from server to client machine ip netns exec "$ns1" ./pm_nl_ctl rem id $server_addr_id token\ @@ -775,7 +772,7 @@ test_subflows_v4_v6_mix() $server_addr_id dev ns1eth2 print_test "ADD_ADDR4 id:${server_addr_id} 10.0.2.1 (ns1) =3D> ns2, reuse= port" sleep 0.5 - verify_announce_event "$client_evts" "$ANNOUNCED" "$client6_token" "10.0.= 2.1"\ + verify_announce_event "$client_evts" "$MPTCP_LIB_ANNOUNCED" "$client6_tok= en" "10.0.2.1"\ "$server_addr_id" "$app6_port" =20 # CREATE_SUBFLOW from client to server machine @@ -783,21 +780,21 @@ 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" ip netns exec "$ns2" ./pm_nl_ctl dsf lip 10.0.2.2 lport "$sport" rip 10.0= .2.1 rport\ $app6_port token "$client6_token" sleep 0.5 - verify_subflow_events "$client_evts" "$SUB_CLOSED" "$client6_token" \ + verify_subflow_events "$client_evts" "$MPTCP_LIB_SUB_CLOSED" "$client6_to= ken" \ "$AF_INET" "10.0.2.2" "10.0.2.1" "$app6_port" "23"\ "$server_addr_id" "ns2" "ns1" =20 @@ -889,7 +886,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\ @@ -905,7 +903,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 12:05:10 2024 Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on2040.outbound.protection.outlook.com [40.107.21.40]) (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 68E7818C39 for ; Tue, 14 Nov 2023 10:22:53 +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="jvH3LCym" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JWV0KICl71AaRRkQ6pnX/DQeNoL47UNd83muZvKOMMFMzVopjatDJsNP60vwPVBPnxYDcJvuHJcwZQxzGRgkfjHZQpRSeLHtt/D8ot+pwtu3f64SA67dAVQIgpHs5L1Vs6Cul0Oj6raJ4IX/cRlsQZsazBLynMxd5YXoqoEl8J9i5M4AK7sRSslpvtzjt948A6BG6uOcvL2y4V7J5brMZSu5DPiNxDiGXGprUgl/jBgYIFQGvaFVxbb4LLEj8kN7E8XDab0LSBBtfigTq/ZUJdGVIZhZ9Lf5jG3VgjT+xHJfjgmG10KbBuzqIInvf0fYGXIATqoeNtp6RUbcUH7tGw== 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=M8m77eV8DDR0uu667W9SK/G4HwI8JJypZSmaCgAF2eg=; b=VIEYiY5MOI8VYX29EiPxXA/RWNq1TkmptIEhDdkkOtcVy2AtjoDZV25ZjQHccOI/us88rU0ouQoFgL1LMhpbWTrVSGrxwBsZGeikuU3ht2a/yv55QLk7tbF+1hzzfK1uoG/qjTFhE1QcBgSeph6coLEy7dnwS5y1MG86akRMqVCUmo7Whi0D80exUYUeJov88Pyea+5aw6AZYy+uitMQnuZ8PyDjdcJrIOuAGrWUX5ksHehhrdVJp04YqBYT2drMBl16/DgeH0IfiTf77ZwvJRrIRSNM4UOY1R3oRVvxWW8Cnxeve6/AL4YzYeLPaWR3kqilcEZoQ+YwHndcDBdvPA== 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=M8m77eV8DDR0uu667W9SK/G4HwI8JJypZSmaCgAF2eg=; b=jvH3LCymalsHu+HALjd1gCvTFcfy+PfncknAq1O+MAeHvX8ChvT9u4qe4rZZMrIeee/RD+NqnyTNWo6wx6gK7R/lUKUvvBIgWBjnD8AxiYmnBVOvynk8g+v3tDZMNEl6lVHbC2+hZTZIEMPqnvHhYvCX2XXadVGPg/BmKaXqiLn/GW2na27OFr4LABDtXg6Ehfu/Lk2SI55KZg/CQUyYbEB5bSVA71aAdGBA4982olVMuMoWDhgXoRTDyuRSgjM4k4DM9yZjoqDLKMDRy/sLlK7HodYkgB3SJah7hdxqF94xlH11a1j5qvXKBMEVVO8ndnFprHSSKujTZ4tzCvglKA== 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 DBBPR04MB7946.eurprd04.prod.outlook.com (2603:10a6:10:1ec::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7002.17; Tue, 14 Nov 2023 10:22: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%7]) with mapi id 15.20.7002.014; Tue, 14 Nov 2023 10:22:50 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v3 09/33] selftests: mptcp: add mptcp_lib_verify_listener_events Date: Tue, 14 Nov 2023 18:21:39 +0800 Message-Id: <18f05c1078f16a5be31d9ad666bc1a10365a74e3.1699956980.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SG2PR03CA0118.apcprd03.prod.outlook.com (2603:1096:4:91::22) 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_|DBBPR04MB7946:EE_ X-MS-Office365-Filtering-Correlation-Id: 5d2a2af4-f0ac-4f2e-14db-08dbe4fba7bc X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: CGLrnNxvLvJyEjNbT29MYOHrAK+/72vdfTx9Dbgtb2xiOURNqxbJSEaVOpfCtEJ/alnTydQ1iCz1zhY3Z0O1wBcurF4H6tIJlWjxp0yqa8FziSUJkAT5+cKrEVJF7D/XKRcRM/aJCqTTdMllBRiugvlB4A6WS7nRLPRk6bTexUEnYeeMizyB5fd51SWmLVSYW84MDCfDL5RMOlVWq9UIjyzq8ZGkev2/n+8CU0qohMio99XgrEzwfA5AG7nByTbIRL6az3xfiR8Gp1kyBPwJlfZ2BCQCt0wLs8HWNcbE8gbNg1+zt6XuRh7S8Q5gcdNXSLZvWSDJE102/wHAd368MLoZc3FsDYk+VXucL7+q6jn+9Ap890YxdQ0bamQIdBdYdUQL4aG/54knlOqLJBmN9vwd+RBs011xaHDuvTJB+BI07vg6+Sd60D1mbPmVBdNHWPwNVD2FjnWkS3jRSjD+en5hN10bmny9DoTVymvl14pJ/hnsVaHrL0FrCtaO3egfrDgkiuuyCIWrjTc2lV9cSgm52rHdrfuKjIl5kwCB2OEdV5j8uPLdHbxsT5zNalGD7qPsePDrod3vfwJ0fac0UVzoxQMcRV1J4flgUkCM2FdM6rNldrDds7mBdvsUzRoH 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)(396003)(346002)(376002)(366004)(39860400002)(136003)(230922051799003)(451199024)(1800799009)(64100799003)(186009)(2906002)(44832011)(5660300002)(38100700002)(86362001)(41300700001)(2616005)(107886003)(6506007)(6666004)(6512007)(6486002)(478600001)(26005)(8676002)(8936002)(4326008)(83380400001)(66556008)(66476007)(6916009)(316002)(66946007)(36756003)(2013699003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?wa1AREKsGXbnyMETNaO0C+lDT9OyBkrL+T90xoI27qKGQEBxxLs4GpLPowsy?= =?us-ascii?Q?e6hJ56Za1om9UdyDbO/SGhjNfdXcTGbNTSTmDYpFaaPqCjpcGen3pQJOpfpK?= =?us-ascii?Q?6nAB7C5pYLxTduIdh54GAohUQF/XCwIt7gA1w+G/WueG5p9KwvwnlMGg01f+?= =?us-ascii?Q?x+3T2GW2K30uqBgj1S3Ss/iprNOtW7ClqjjVIz4x5/JDCbE4Wc0c2efyRDk+?= =?us-ascii?Q?PWqEXnomd3xtNMYTO5G/bfizk/SE5SELibqm0Cqd6/h0tkebdPGkfkf05CT6?= =?us-ascii?Q?3OdgG6AwOXm04Mggn9rDJbBDPoAv8f9iFaokVGAEva4bM3f8ORvYi2RdsDvf?= =?us-ascii?Q?i3rbMa8pUSqHKYALG78KM03BvfBIx9Gi00RY3eWmx9265/3cpj5/LWHLk8o+?= =?us-ascii?Q?I9qOOUrZJvjRYvtPlLxRabH0TXYBKT8QgAf95aEVDy12HaKxtfvcn3mNVLrF?= =?us-ascii?Q?GYeE4D06ucurApxkD2FIgptXCs7wyECOKB7wvb/v2qmTesWeqLniERQ7MYoG?= =?us-ascii?Q?+e6/GGw/gGwlj7VDESMBlcbvszGN/iFPnbWrb/UrNy1f3qdTmwJc1BPi2kh1?= =?us-ascii?Q?w3yZ57WqOSUOyY+9SsW+8I5/QN7/TFbnafTMI5W9OT5Joqxuxr8YUpsQW7N0?= =?us-ascii?Q?kZHOtlYMLpVuQMlAZg5kSMdtEFv9s+XoZ6qdmGO9spmvpOF5o0vghaRE92bN?= =?us-ascii?Q?HtGo+ZRhB2vuMQ3B+ZhBJ0pfZQy8IUmOrzyuAHNdZriPWNkL1eZs4NyIIDwY?= =?us-ascii?Q?XYG2n0DgMj8tCsKHJYF/h6NGKkz8cEAaR3FNDRaZViKxyL4FoBZ4MLArghV3?= =?us-ascii?Q?3dtZ0RDgRXCFK1EfVRxnJ9ZXu9Tda/R6tehysHDWNNP48+rUIs2pOhlfC0Zk?= =?us-ascii?Q?A9Z4Mm87tY4VcvafsodLWjKQs29cPlAwSHZMAhnnEZhoimQDxEtRE+3e8sGm?= =?us-ascii?Q?8Mq7+NmYULsc7KRCFPq+Y9MlApAFK44R3UNqojCjbcFU/BlWUs4F1cioH7V3?= =?us-ascii?Q?h+qzaTrvhHzb/fRUC4XYopJjuzmMC2IEHdZrWZRVRYTlKeKdPiH6qpgPjaUt?= =?us-ascii?Q?rwOKqZJCEAjy9KLTFRqNwa21IEfq8ZLUyml5mEBJt1Vuqq2CF/hZk8xt7Jbz?= =?us-ascii?Q?QZ3pYW9MDPaM4O/87i1XLAPXLpkwacbocTLYjHGDmdxCBhcUUe0NnjgOEZIZ?= =?us-ascii?Q?RPlx4/yr+N6YosItgg8SPPFpU4RJ2f+B0Ax44zuEII+R7ZDmugis0AslzHmQ?= =?us-ascii?Q?pIPrf4OkdHy0ROho6fWAWk4UjzNJBycTiilWcA9EGXivGITy+Kv+RRnauInW?= =?us-ascii?Q?xaRefKZ4AmNV6dOj3dq1KWlZYYHaPKBtChgeNPtuZctdsbP9DyYSIsS3ITCs?= =?us-ascii?Q?iI7DVMnAUECXjqL7laIYaqTx+eYwJcYNS9mZxd5UAnzE+rc4BS46MzAASl3k?= =?us-ascii?Q?zmLssVW/2ECd+cyxqD8LH6kGrQg5Fb5ItFZM4Ylw/subAEkD7xRlNn0eggDD?= =?us-ascii?Q?G7Fi49tZvzTlgECrojcqv6kTOiJgLceLzYOgZnHgSSiw0hz9iL39zZyCDiAs?= =?us-ascii?Q?VhwW/WabE+a5udfITZQhzjOB+Ck/NdrdKzrq4giVnU6l5RdLU3HSgGDVU+Cs?= =?us-ascii?Q?9g=3D=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5d2a2af4-f0ac-4f2e-14db-08dbe4fba7bc X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Nov 2023 10:22:50.7751 (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: Xgok0xxOmJEVcnqZB92+gZ7CRiu1nROIW5HD6EEY9CjQSlgKvvrEHKSi3cxICM66l4yKCkQFOfG6Pfs9T3lR1g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR04MB7946 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 1c3df7831855..9ad8c600e58f 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 accd3a62832e..7a6b85100c98 100644 --- a/tools/testing/selftests/net/mptcp/mptcp_lib.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_lib.sh @@ -443,6 +443,29 @@ mptcp_lib_check_expected() return 1 } =20 +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" +} + mptcp_lib_cleanup() { echo "cleanup" diff --git a/tools/testing/selftests/net/mptcp/userspace_pm.sh b/tools/test= ing/selftests/net/mptcp/userspace_pm.sh index 2e9fba4e07ac..5e1d282ad3a3 100755 --- a/tools/testing/selftests/net/mptcp/userspace_pm.sh +++ b/tools/testing/selftests/net/mptcp/userspace_pm.sh @@ -839,32 +839,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 $LISTENER_CREATED ]; then - print_test "CREATE_LISTENER $e_saddr:$e_sport" - elif [ $e_type =3D $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() @@ -880,6 +860,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 & @@ -899,6 +880,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 12:05:10 2024 Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2080.outbound.protection.outlook.com [40.107.20.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 23C4F16412 for ; Tue, 14 Nov 2023 10:22:59 +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="oVjezXnk" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CLfoZyD5XY1kSOSMKU6o9+BzGLIZIIdClat3X8oaBIKTfhELvYcJGWJWm8n7qh1z7hULDT2VRHPaLQsxD7rRVy4nOzu9H04Gv7Rgh4G2g8PZy5QEULPIsSyV0J9g11bZXOuMB/kP/XZmPFazjZPs6YxvW7AXVpnlugJsuTH3UL1+4yf9mhcxEiY8X3TFNmGaq8yhMxqBE6+P/OcSpv9sraXjQe/GFx0jRFxQTwV4eW3zIeG+RjyKODO3kE7IVeamtXuDA3r6/uQzU8QDN4uDrYFreXnJVwO4bEl5iZoQ7dpbOLIjWCKDGQi9vdHLqVOvIi4Xm0jeDCHkAUKq13HPjQ== 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=GByRMhoJmYKTOwoDzD3yf4AzdlJtmvjNU7vpI0qa3p0=; b=lsOJmLjvsshWvFiSSPLADF7yjrpILa8F0XRC56X+P0m/vO7fCaKg3asLmjeaGI6jhuEYvzlC7R5zJHTrWO3qz/p4gsS1IMSayZvtI3MzmPvwCZS7h5I7wGc3SKmjmB8NB7xoUgV+jntUDsOdt+u8AlHuPE3A7Ukqs9kWEipPSPrfWJSAu9+7S584c48pOQXZFZLCPTda82raY8tcJEpqrybs5IpzOM4TuvQG90Mb+bnTymZ7yYykOPEeFC8q6zRrEuVbnm+t1Gv7fhvmIkgxu1DOeWwL/cFWdkSZCZD3pfBHvkXAZFhiNIRAxdGm92JChNxWcfjjrhM64e3QkvHx/g== 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=GByRMhoJmYKTOwoDzD3yf4AzdlJtmvjNU7vpI0qa3p0=; b=oVjezXnknzqUi8eiZULkiw8VSPaWSBht132mrRzWJ15LHVlMLPddfi6vnixLFZFDuoJJLdYEZQrC8tz6h8yfe8k4o8TGYXFACkrl92cPcojHWxCiQHu6IRn72Lds3XvEYogiFesqhIuLlMrFdiQoFL4YsLX8Dj8pXz/uJn4wSRAAbdhfO+8bqk8BhVsiONn53uFRC4pkXLAzdIXbe02JSoFxZBLR779raqklPuQbO5StcECg/SINvClGIvRPgga0XP4ZkZT5x+JpNBtrxVkX3fGriBzsjgHbtiw1FCD5n8FPss5ZZze4jAAK3I8VykMdO+ngR3P+cOZJrMoxwNYiSA== 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 AM7PR04MB7013.eurprd04.prod.outlook.com (2603:10a6:20b:116::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7002.17; Tue, 14 Nov 2023 10:22:57 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::7102:259:f268:5321]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::7102:259:f268:5321%7]) with mapi id 15.20.7002.014; Tue, 14 Nov 2023 10:22:57 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v3 10/33] selftests: mptcp: unify namespace names Date: Tue, 14 Nov 2023 18:21:40 +0800 Message-Id: <0dea4fe7c2cf50ef187683f435e845bdb85f4861.1699956980.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SG2PR03CA0125.apcprd03.prod.outlook.com (2603:1096:4:91::29) 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_|AM7PR04MB7013:EE_ X-MS-Office365-Filtering-Correlation-Id: 67150d05-7b65-47a6-2266-08dbe4fbab59 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: WBGrlyqRhvbWDty+wgQXSlQRTGezoUKnEgieHV6y+ksMCMVAr/xYN7Nuaaby7iaZLW1VQTS+L+AcYRdO6HWMQ0o4lUQ18eknTv/RLdbjccjW8ZK6BX5ESXH10XhNwSR+A40+iJmPhfSOpUWhnIKTYi2bnHvuStvp/0uFz7yloQI95rPEd11zod/FeV3NHwZwLUTEv8YdeyykR0qcGJLTUcCPQExYQDmp4dxO73HSRw9q3bXgmlldndokytNruK7LdIbotvl5KyVMTtTkBLW3meWCMdlJ1WbdVGGpAkCr3OK/LmKgpQorj0VUVrqqfTpEk86Lw5jHeSetQn1iqPTTtR/0CBEgs2asIt2VPAOgMoQm++TxueLkBp91mfpSCiuA1ZBKwBfPd8hxV6rxucDCBgjwE136h7Ch+qd6pPwNBH6fbtB4TelwI+JlV4KPWSVfs4co0ep5Na3OY4HBUbWeA02MCk+i89IZy9fHNMOKcM8ULnx87yrJs/iWzUVVfx4wZ0mGMCLpGgBFWLx2w88y0FYn98c8AkP7maeKfI7IxCac9P9FN2ypK2GcwH/G3isT 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)(39860400002)(376002)(366004)(136003)(396003)(346002)(230922051799003)(1800799009)(186009)(451199024)(64100799003)(6666004)(83380400001)(6506007)(38100700002)(8676002)(107886003)(2616005)(6512007)(2906002)(86362001)(41300700001)(5660300002)(36756003)(8936002)(44832011)(66946007)(66556008)(66476007)(4326008)(6916009)(316002)(26005)(6486002)(478600001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?9rwYWKiQuGK0xPeLRZttEJ/sM3Uyz9mKj78cqYGAkPXxDyu9s1p3Oa5n7kaK?= =?us-ascii?Q?mNLsQejS93Sd5lw85f/acMAVFUrg5lPVymxTPgNQ3aMBP5FpBvpI9qtTb5DZ?= =?us-ascii?Q?IVlbwc9VjC0e7H0+EZ5uQdV43W3pvzIHIYbpwS5VXiEauhc689vRx/gnndlY?= =?us-ascii?Q?WRVnInvsDLrMoclV7khwwhxs1t7yNgg87o+AcfzWzwaXd75QWUocrJJDreTq?= =?us-ascii?Q?n0qtjbpjGfTz5XO8aN4AelzXHCuSXWIwwsqh+pDZ5ch6Zj9oh7JlTO7k8fBs?= =?us-ascii?Q?KR4Fal2Ch6S3p9EIadth11jF8kFfP2x5K3URdim5kHbe6vvQWw4ff9lP4st9?= =?us-ascii?Q?zssreE8pPUv3Fr4KFi2KQTHvmLamSySHrvNv5X5JJei5RbLKV6ijZ0J0U8ul?= =?us-ascii?Q?33dhMo81MzbrJ4IhKFwBpnCgNoExtuUN67/iDL9oXT9Wgj0UkMili5OTmVPD?= =?us-ascii?Q?uNV0fYsOdFE1qLLayAuQNy6EUmROs7ukSU2dbCJzQa3lIu+bR12fJE7clIMP?= =?us-ascii?Q?zRTnFn2MSV+Q9OLdJsfki6zmHpqplxq0WNGDxclYdzyF5vWv8kw/xgZcz1Mc?= =?us-ascii?Q?LowgAuw355IazWm3dDhAQw6gcinKvPEr6iKDDpYH+n6C2Lf89Vmzu+jQD8d0?= =?us-ascii?Q?kQqboDBdGCxuD8SpC8KzkhkrpHpC8ROcPj9dgFSrSv7Ywe5+nmuciifIx6mh?= =?us-ascii?Q?E8Aqr49IPRfCCxebcseSzHdy2aFCT8YBcDzxKdBlvT/mAJXYc1rlEyN95vz6?= =?us-ascii?Q?7kPI3r/fLys78O++76ne06eX9Lh8wbtssZoD0ZSqM9zGIR+buYeLROFNkWut?= =?us-ascii?Q?m7tHSnESfuDpCoGTUrEBhnV/MwEsX/sHKQ8g7UipSbDcrdwljE+NKtmTc2te?= =?us-ascii?Q?lyXigoQB2VZJ9ROV2ChaanqOpy2zu7+lFqETMHAAPWAiS/SHN0dr/mg/ndKC?= =?us-ascii?Q?O8bqHPtOXsYaGurFbNDtPFejkJhzZ16CmCUkpNNr/sp9lEoW0nBFXmWcvuxp?= =?us-ascii?Q?ujpdJRuysxIPtHPsVyhKAbiactMjYzW3hOOqkkRFsPlRV4aAtacOhIWGAzuO?= =?us-ascii?Q?wwYoBp8sa0/sb/RRknVwOzj79927+ehlJYYWMEj6GAlDIT2U/TgmTb4HD35y?= =?us-ascii?Q?HoWXtJRrRIfR73syjW7UsvqIGfPMU5BGJB9ohancnsTAlrEttXiuvx967qnX?= =?us-ascii?Q?0u2jIkZrEbu9votCO4n+Uh/1TPe2wr52zKErHN73OAcRNbhXT0ydPeYOcuE2?= =?us-ascii?Q?hz4ZUnhGEiDR3upjkJ0Cmq3010a4gLiw7mOprYxPrbdJZfHsheRatpFWmph6?= =?us-ascii?Q?ZSpwt/p4oGT5nN8uHn1AqVgM8ZflmsNzmOZLcDRQN8pFAFo+cng1okOT/Hvx?= =?us-ascii?Q?SKX1j9vwCXIu49XHBZSqmj1dy3H9lZJF8TTkkua1yUYshwU81/E+GIIYOCM8?= =?us-ascii?Q?D4iBEpVZuQcdrlYcSctoBXbI5tddVhVLONYWaz0eHcU6qTD9eFSDcOD6V1PV?= =?us-ascii?Q?H6nI2Q74lByHvU7wK/j2ewEkxd+Le/NPwqKz6sflYM/UW3KSrud9giCHc806?= =?us-ascii?Q?gw5iJdNIYfjnxkfYiENoCG4E0DlE0RHhA2dxs5KcEgkFvekSb7AP/YGgBI6P?= =?us-ascii?Q?nA=3D=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 67150d05-7b65-47a6-2266-08dbe4fbab59 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Nov 2023 10:22:56.9970 (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: zXXKY7cIkLmyQYHECpPjKGJ+gj9I31fN4iJaeslifALaLNV471X0GGhnrGUTHeGjIjgB+3Of7XvAdil/afLI1g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM7PR04MB7013 Content-Type: text/plain; charset="utf-8" Most scripts use ns1, ns2, ns3 and ns4 as namespace names, but ns and ns_sbox are used in diag.sh and mptcp_sockopt.sh. To maintain consistency with other scripts, this patch renames these variables: ns -> ns1 in diag.sh ns_sbox -> ns3 in mptcp_sockopt.sh Signed-off-by: Geliang Tang --- tools/testing/selftests/net/mptcp/diag.sh | 46 +++++++++---------- .../selftests/net/mptcp/mptcp_sockopt.sh | 12 ++--- 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/diag.sh b/tools/testing/self= tests/net/mptcp/diag.sh index 300aec419dd6..bc3f24c454be 100755 --- a/tools/testing/selftests/net/mptcp/diag.sh +++ b/tools/testing/selftests/net/mptcp/diag.sh @@ -5,7 +5,7 @@ =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 timeout_poll=3D100 @@ -17,19 +17,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 mptcp_lib_cleanup } =20 @@ -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() @@ -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)) @@ -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 45e5b5810a6a..b82f7b0b85bc 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh @@ -17,7 +17,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() { @@ -40,7 +40,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 @@ -79,7 +79,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 --=20 2.35.3 From nobody Sat May 18 12:05:10 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 6E29116412 for ; Tue, 14 Nov 2023 10:23:05 +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="Edp1Lmz1" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gYrPBHnF0pFdE7wGlVgo63SX4J6vGB3w4uPdWziiRX46wjPuECeNHV8L8j3lsMhdqkZmG+SnbIMrYmM6eCGYjzhkNo0lyPnLbrZVSept4o0zAShQlpHaYfnVxabEaCe8+6T8HDpebUu0RM72Me+8f6lreEF5S9zcZcCQz5tHfv1m5iGlsmkv3J3lLWuoEUAFukcQRTM6wJ/0iVGjzlQyKF/5/2Fp3KroxMI6cXPvA/ZzxKK/64GYVghOYhnaJ7UCh29LS6wWaUw1eCe4+qUhLH7BG+Q6nTaanZNYQl9wo1y73NakLaHAhfGUcMNbfi+ZFHequnQ/ZqgCfPe+9xA5OQ== 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=ubiBzAOgJJZr4EAKsigJgo0y3x8UuI3bFjjZw8flUQk=; b=H7GlTIzxqRoeLwELiax0DQDtZwgzysoQ6bHu+3oiR96JgHv7y36hrrAiJdP1T7QWNaBhucHxGLvvQPT0zYjNXDia3gLOqqNSxipsHrVwP8GOIxzBDjBEM2l3POgZ4HaUNEVdVYshDCfczbsh4iDpMg8GTv3NSRCISNOWt6ahumOTL7pY8ZOxsGjyAeyR8fv2nS1DFJdaQuB8fQMJ97agXyB929KwJ48S+SXUnSzIwW6FRSrZ+j+gZLyZW/0dOr6p7lq/s12kzoABKuFKq/JIAI+sEVcQDQ800T9z4BBWGZWhCK2D9qLVD/4d12XhBb7g7I/eebQF+pGy2f3ZZ9Sp+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=ubiBzAOgJJZr4EAKsigJgo0y3x8UuI3bFjjZw8flUQk=; b=Edp1Lmz1N40kUhCNj8xWaQv2ETGHZmd40E3UurkEPj/ryvZUqhTd04Cr33/x3qUlPeAmdAKxv8myz2xeqHnOndEi3DazUZ9Cnp33xS57EUhajL/rhFQ5NUSyIsaWNv+8MPl02bq4hMW2rbt1GlbH3AwS1R7eR+w3eskWg7dnxEDN47TlHPtzYKYKAQp17CT2htIzDkM2gK2u2aN51c+Uj3FZDiE6JMFGQgewk/lkYg8tIpMpI6mmgRpF0gKf4KDy7wlrRVkzfArc/g/r99f3wKL2rmjRskvjna1iAy6g1Qg0nAkLp/0XlylWoSOOa5ypmLHSyepLXoxUYIDYccOzVA== 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 DBBPR04MB7946.eurprd04.prod.outlook.com (2603:10a6:10:1ec::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7002.17; Tue, 14 Nov 2023 10:23:02 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::7102:259:f268:5321]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::7102:259:f268:5321%7]) with mapi id 15.20.7002.014; Tue, 14 Nov 2023 10:23:02 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v3 11/33] selftests: mptcp: add mptcp_lib_ns_* helpers Date: Tue, 14 Nov 2023 18:21:41 +0800 Message-Id: <6bb8a0f33d55f757baf16122e4ed67fc790bb313.1699956980.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SG2PR03CA0128.apcprd03.prod.outlook.com (2603:1096:4:91::32) 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_|DBBPR04MB7946:EE_ X-MS-Office365-Filtering-Correlation-Id: 5de92878-9451-45bd-22cb-08dbe4fbae86 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 6NBCZ/wd+gmX4nf/rBeFCHzN9Rje8Hsx93itJkApc6iDC0bmErZ0UGNbUWR8OEtDCbKMUUgkcEDWMO0vYRGRB5q4ZjvxjqI58VEccIQG6BR0iuXc+fnVMaViTr0k8s4ZPzw/vndPpkM/6/TgdXNC0E9o2LfBvE0PpX9vz15C772ihWPSM6leyWNlj+/wABn8X3LMDM3csk7IXbhEl0cdzgM01UL1VQx4KYYRTgIZH0UkfCmv/b3dAk/6vmx3/4UPKET2v3dt9BFeZJBNmujGC/sk21XfhBoN49bcAGZZueO5dXhm/tT6jldzfPgQWIesMP3g8ye41yCTpq6RBpaRAIS6kE6mxK3Wkwjjg+FNoH6xknMqY/GRM/f/b6X3A2iACepYjRL/Oksz/RONr/vRPgxfTobvGN+2tQX1NMjQxn8NDaykFtzK+L4uas/zfC2S+D+Ovc/M5miDSqOwC1ImwPgKQ+xEdoTkfQb8iNxCc7uNQzcIzaZlS7w9I+CZSpjNv+/+8zQnqrz+INB2bgO2UQvh81ZzLymy63NAli6rk9Gj3cqwLa4aXTXYVOQYWGrV 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)(396003)(346002)(376002)(366004)(39860400002)(136003)(230922051799003)(451199024)(1800799009)(64100799003)(186009)(2906002)(44832011)(5660300002)(38100700002)(86362001)(41300700001)(2616005)(107886003)(6506007)(6666004)(6512007)(6486002)(478600001)(26005)(8676002)(8936002)(4326008)(83380400001)(66556008)(66476007)(6916009)(316002)(66946007)(36756003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?xfladAZ6eNqR8DVgRtFA8Irez6wBjd8/V+geV67oJV6nYqaMwHnWjorYX6za?= =?us-ascii?Q?vU749WtyLL9uaSmXtlsLlB4LrKZ+YZPQCbr1JUAazARQbnPhYpKCl79wLjhY?= =?us-ascii?Q?az6KMTLphsZrVkkkJSAZJheUjljOirsi+qDF947N30hdXlSxOJAsWSqZ2yff?= =?us-ascii?Q?S0wOhASh25eAt4RAG9ToG59xkoU7zUYaj56qSSfONptDjuN6eiTERZmjtEOo?= =?us-ascii?Q?sUauHBRSpUfYVCBykYNYEpB9EUqGIoytaQIMqlq++f+JaI2CuKOEc81ASPn7?= =?us-ascii?Q?T7Lgb3RaGeuIY3a/utAXd+SM19hWioucDmJ5mZZtm9TFVfDHGSDHy0FpKGqe?= =?us-ascii?Q?QHe4XLgH+IJsVbQ0CpwlErvcGznXzHb2zfD3XC90uxMXFMqDaz46zqr65nCR?= =?us-ascii?Q?cMdgjSCst9AXwkz70VlgfKsPMaLDJ8hHALl5/DIQvRyvCRk7lNyQ8hIJiDTn?= =?us-ascii?Q?4SCxo0pmkW9iqNwEQyUE0ELXJTH2FURVSoROz7FFsFToJkx0ZE1qxhE8ReD8?= =?us-ascii?Q?vv6kAsod+Iy0AUWinody7DvlTt8tgmUYNX0c0qXwL2gb1j5UtBMNbcg7mV74?= =?us-ascii?Q?op5F7ljDQzmIzACgug3CRq7k5YWbx/oLbdx645KzLpXfD4yqb2UfvLeJ5ChK?= =?us-ascii?Q?TsUhFfc65zh4M85DfXtLxsocqyJKtfzdQaa+vYHNhsfBUfNsT9XhBJ0W0BWs?= =?us-ascii?Q?S1cvg9F8PkmVhnSYzd1EBfM9xUAGCs5NzZKwrifYYUJIPmDBV4lG2dqPScbf?= =?us-ascii?Q?FHXwhFxZ+roLRld3ATPI41FN6nrBQJNDEhU3DF2yQaY7m9xy83bv8ilvz08L?= =?us-ascii?Q?YMf3TDcuzjcIId75LbcfKu7hcAP1YNqHvkA7FMvGAgXeSrJvVv+GqYqigrll?= =?us-ascii?Q?q57sIldmDqLX8HvnAwVYXI/EcTP/L/19pFAtmQPaMUFButIDr29sXrQmzs60?= =?us-ascii?Q?kiEUFFDD0+mHL0BsqjMM1ub56ry/I5d+6iA5EzZc9KJWOkut4H1y9cRaI9V1?= =?us-ascii?Q?6oU18XiO7JLxJv5vPPZiHrvRKlwq/YgmIPg3ln8g8eR7lFQGJ0FRphsq+3VR?= =?us-ascii?Q?goX3xZgg1D+q1Qvrpwnru9HjqLjzMgYRRDLDleEPywcUqryl9DbAtDjDVU3g?= =?us-ascii?Q?WgfmguzVdspSiPNthWKmOY1+Bf1qhRgbAh2ZSms7r64WCO4J/lSkZ8/I5jsi?= =?us-ascii?Q?Hj2dEuzHkHxc/pjYqnWl28O/l+FaPUrV9U00+UsgaHfnYodvEj1E3QCRMePM?= =?us-ascii?Q?3AazlmvHkQv9cnCjQdibhJAhyu7kNcRnyxvO7UGUov/aiphwkCJrWFv4bCN1?= =?us-ascii?Q?jawvJm+lN2uWo4scjWLOPeqm2DdnuhRUhz1adpB+KVpNSh5KqZGAfz3Ra8/Q?= =?us-ascii?Q?6hhaGv2CqQNRVUMJofLrGrHAx4dTk4fxM3N1cpctnWiYD6vcQDauhwRn8Mnc?= =?us-ascii?Q?Zb7feehvvhUWJXKgRSvZuVjMRb3vG7fYKpk6f3EBFR1//ZyvpEE+9l3pqNfZ?= =?us-ascii?Q?5Ymyjlsn6PA6ceF2LhPF+t+Du6HMY9EbCc3+DKNefw2MH5ky20AUQRdAWupg?= =?us-ascii?Q?outKLASkMiBz9BdjeYq3sHvJuBytTXnxJwHDcBvy4lW/sWB9mhOTwDgA/Jgf?= =?us-ascii?Q?cA=3D=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5de92878-9451-45bd-22cb-08dbe4fbae86 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Nov 2023 10:23:02.2240 (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: /IIaDWwSA+veRQUqE5+mxTk5/88Llr1JXuG9J4/sRwERj5jj0RQS79OvAoEIaFTqS7vSg1gS+AM9yD7hSf9s6g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR04MB7946 Content-Type: text/plain; charset="utf-8" Add helpers mptcp_lib_ns_init() and mptcp_lib_ns_exit() in mptcp_lib.sh to init all namespaces ns1, ns2, ns3 and ns4. Then every test script can invoke these helpers and use all namespaces. Signed-off-by: Geliang Tang --- tools/testing/selftests/net/mptcp/diag.sh | 8 ++--- .../selftests/net/mptcp/mptcp_connect.sh | 18 ++-------- .../testing/selftests/net/mptcp/mptcp_join.sh | 19 ++-------- .../testing/selftests/net/mptcp/mptcp_lib.sh | 36 +++++++++++++++++++ .../selftests/net/mptcp/mptcp_sockopt.sh | 15 ++------ .../testing/selftests/net/mptcp/pm_netlink.sh | 8 ++--- .../selftests/net/mptcp/simult_flows.sh | 18 ++-------- .../selftests/net/mptcp/userspace_pm.sh | 12 ++----- 8 files changed, 50 insertions(+), 84 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/diag.sh b/tools/testing/self= tests/net/mptcp/diag.sh index bc3f24c454be..3119811018fc 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_ns_init ksft_skip=3D4 test_cnt=3D1 timeout_poll=3D100 @@ -29,7 +27,7 @@ cleanup() { ip netns pids "${ns1}" | xargs --no-run-if-empty kill -SIGKILL &>/dev/null =20 - ip netns del $ns1 + mptcp_lib_ns_exit mptcp_lib_cleanup } =20 @@ -197,8 +195,6 @@ wait_connected() } =20 trap cleanup EXIT -ip netns add $ns1 -ip -n $ns1 link set dev lo up =20 echo "a" | \ timeout ${timeout_test} \ diff --git a/tools/testing/selftests/net/mptcp/mptcp_connect.sh b/tools/tes= ting/selftests/net/mptcp/mptcp_connect.sh index 5e28292e1889..5e0263e691a8 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_connect.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_connect.sh @@ -120,12 +120,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_ns_init =20 TEST_COUNT=3D0 TEST_GROUP=3D"" @@ -137,11 +132,7 @@ cleanup() rm -f "$sin" "$sout" rm -f "$capout" =20 - local netns - for netns in "$ns1" "$ns2" "$ns3" "$ns4";do - ip netns del $netns - rm -f /tmp/$netns.{nstat,out} - done + mptcp_lib_ns_exit mptcp_lib_cleanup } =20 @@ -163,11 +154,6 @@ cin_disconnect=3D"$cin".disconnect 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 -net $i link set lo up -done - # "$ns1" ns2 ns3 ns4 # ns1eth2 ns2eth1 ns2eth3 ns3eth2 ns3eth4 ns4eth3 # - drop 1% -> reorder 25% diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index 9ad8c600e58f..52a4080b32d9 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -21,8 +21,6 @@ cinsent=3D"" tmpfile=3D"" cout=3D"" capout=3D"" -ns1=3D"" -ns2=3D"" ksft_skip=3D4 iptables=3D"iptables" ip6tables=3D"ip6tables" @@ -78,21 +76,12 @@ 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_ns_init =20 local netns for netns in "$ns1" "$ns2"; 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 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 ip netns exec $netns sysctl -q net.mptcp.checksum_enabled=3D1 fi @@ -137,11 +126,7 @@ cleanup_partial() { rm -f "$capout" =20 - local netns - for netns in "$ns1" "$ns2"; do - ip netns del $netns - rm -f /tmp/$netns.{nstat,out} - done + mptcp_lib_ns_exit } =20 check_tools() diff --git a/tools/testing/selftests/net/mptcp/mptcp_lib.sh b/tools/testing= /selftests/net/mptcp/mptcp_lib.sh index 7a6b85100c98..0498e3758b9a 100644 --- a/tools/testing/selftests/net/mptcp/mptcp_lib.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_lib.sh @@ -466,6 +466,42 @@ mptcp_lib_verify_listener_events() { mptcp_lib_check_expected "type" "family" "saddr" "sport" } =20 +rndh=3D"" +ns1=3D"" +ns2=3D"" +ns3=3D"" +ns4=3D"" + +mptcp_lib_ns_init() { + 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" + + local netns + for netns in "$ns1" "$ns2" "$ns3" "$ns4"; do + ip netns add $netns || exit ${ksft_skip} + ip -net $netns link set lo up + + 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 + done +} + +mptcp_lib_ns_exit() +{ + local netns + for netns in "$ns1" "$ns2" "$ns3" "$ns4"; do + ip netns del $netns + rm -f /tmp/$netns.{nstat,out} + done +} + mptcp_lib_cleanup() { echo "cleanup" diff --git a/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh b/tools/tes= ting/selftests/net/mptcp/mptcp_sockopt.sh index b82f7b0b85bc..ff49ee9b9cc2 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh @@ -13,11 +13,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_ns_init =20 add_mark_rules() { @@ -41,11 +37,7 @@ init() { local netns 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 - 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 done =20 local i @@ -78,10 +70,7 @@ init() =20 cleanup() { - local netns - for netns in "$ns1" "$ns2" "$ns3"; do - ip netns del $netns - done + mptcp_lib_ns_exit rm -f "$cin" "$cout" rm -f "$sin" "$sout" mptcp_lib_cleanup diff --git a/tools/testing/selftests/net/mptcp/pm_netlink.sh b/tools/testin= g/selftests/net/mptcp/pm_netlink.sh index 75c7594dbd71..32265d4ecb41 100755 --- a/tools/testing/selftests/net/mptcp/pm_netlink.sh +++ b/tools/testing/selftests/net/mptcp/pm_netlink.sh @@ -23,13 +23,11 @@ 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_ns_init =20 cleanup() { - ip netns del $ns1 + mptcp_lib_ns_exit mptcp_lib_cleanup } =20 @@ -43,8 +41,6 @@ fi =20 trap cleanup EXIT =20 -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 check() diff --git a/tools/testing/selftests/net/mptcp/simult_flows.sh b/tools/test= ing/selftests/net/mptcp/simult_flows.sh index 3536c7160ce5..c1a21cd8c076 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_ns_init capture=3Dfalse ksft_skip=3D4 timeout_poll=3D30 @@ -29,10 +25,7 @@ cleanup() rm -f "$large" "$small" rm -f "$capout" =20 - local netns - for netns in "$ns1" "$ns2" "$ns3";do - ip netns del $netns - done + mptcp_lib_ns_exit mptcp_lib_cleanup } =20 @@ -64,13 +57,6 @@ setup() =20 trap cleanup EXIT =20 - for i in "$ns1" "$ns2" "$ns3";do - 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 - done - ip link add ns1eth1 netns "$ns1" type veth peer name ns2eth1 netns "$ns2" ip link add ns1eth2 netns "$ns1" type veth peer name ns2eth2 netns "$ns2" ip link add ns2eth3 netns "$ns2" type veth peer name ns3eth1 netns "$ns3" diff --git a/tools/testing/selftests/net/mptcp/userspace_pm.sh b/tools/test= ing/selftests/net/mptcp/userspace_pm.sh index 5e1d282ad3a3..6512d198ee23 100755 --- a/tools/testing/selftests/net/mptcp/userspace_pm.sh +++ b/tools/testing/selftests/net/mptcp/userspace_pm.sh @@ -40,10 +40,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_ns_init TEST_NAME=3D"" =20 _printf() { @@ -102,10 +99,7 @@ cleanup() done mptcp_lib_evts_kill =20 - local netns - for netns in "$ns1" "$ns2" ;do - ip netns del "$netns" - done + mptcp_lib_ns_exit =20 rm -rf $file mptcp_lib_evts_remove @@ -118,8 +112,6 @@ trap cleanup EXIT =20 # Create and configure network namespaces for testing for i in "$ns1" "$ns2" ;do - ip netns add "$i" || exit 1 - ip -net "$i" link set lo up ip netns exec "$i" sysctl -q net.mptcp.enabled=3D1 ip netns exec "$i" sysctl -q net.mptcp.pm_type=3D1 done --=20 2.35.3 From nobody Sat May 18 12:05:10 2024 Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2040.outbound.protection.outlook.com [40.107.20.40]) (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 2011216412 for ; Tue, 14 Nov 2023 10:23:09 +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="jVjFX+la" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=USY09buL0DsmBSS25VTqvwl58zjpZgDRsCzkvPFvlCM1ezqx4qAOrv28sjQ9fMh6PxkvC4A//Wfo3DdbQZo1NvvJs4daYfbvM/Y+cd2GTmqSJkcq67XpvJBeAgdgQr2OuH3UrN40SvsGLDqQiHeGW5Lp0mAAKLRmquQF4Srix+zPP+WNwmS1HOKj9F+j2ItpO2kU12xCFR272qUgwwhWwdvx7QiEmpK0EZCfQ3ZxlpRsDXZsZz2YKy/Oxqy3paUCcr836a1BryS0r2Jt7RNBmPemKxd1B1mV6NBaCJ6e8+RICjdtoyDRImkAyCvPDhf8QlIxr/tx9zbpEU9euaTwdg== 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=T38sL+r3/wWcw1Yc3opwLZGblto/rvJgRPxzV6SkvKU=; b=hJUcerK9kNfASWar7uI3ORtpRkMAQgNB2Ciq2Q161yv4s2muQMeyAJyBptr8HIBoYW+z15Wo2U+g1FCN6VpJMbdSAhL7PIM9G/gCxcDlx0TIexxRtQWfoyQTkSV56zFrR3YqKuwtCjMrYLZB4P/RoShdmXwNFFpgQfPxHty7hd1UU3GmtkF/fMkgbFBr3/hZ8lkkHuK6/y5fklDNzjErWRtk/L1ca0zVJ7uhckHakaU89tQxzQRqw3UzkAAKe3GVBW5VOPn78bgPzK4S33bqIlr2qgkPRf4DhzygxKGJ6EI8DWbUX/1K38j5yUD69K8bJ/6wpKvNBP0mom1NlApyfQ== 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=T38sL+r3/wWcw1Yc3opwLZGblto/rvJgRPxzV6SkvKU=; b=jVjFX+laFr9iaFN6aITtjwoCuik+lxPy+kq/NpWPlDpn8iBpLeFP6549ockA9Oc+9oKu5XmShgwWOt7zTT1HHxwHOJvR9qs7vpyWkz5gBsEjW+ZKxNmn9XhUaU9BgiitxnIolUuyO4U3zq0kWRdQ8usxH1Jwq4RJb7lw6vQfM4KO1S1WQQPCdtopkAja8tKC+sCUyDsrx17sV0RicL1NmwMZeDNEe/e6vPXPMzUQV2Q/5DOWIc7aFf4ctguXcIVoWTuPa/crLEjV55l5rQKCyZqB7w2aMN9DXgnmRtihvlIGHqg6PV4i8eOpX+ft2mat1fNWo4g7egc7y0DoyIsVww== 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 AM7PR04MB7013.eurprd04.prod.outlook.com (2603:10a6:20b:116::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7002.17; Tue, 14 Nov 2023 10:23: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%7]) with mapi id 15.20.7002.014; Tue, 14 Nov 2023 10:23:07 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v3 12/33] selftests: mptcp: diag: print colored output Date: Tue, 14 Nov 2023 18:21:42 +0800 Message-Id: <0c29ece3c46db3a94f63a66c2bb96cf1dc53b2be.1699956980.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI2PR01CA0005.apcprd01.prod.exchangelabs.com (2603:1096:4:191::23) 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_|AM7PR04MB7013:EE_ X-MS-Office365-Filtering-Correlation-Id: 484b2947-9f21-4e6a-23b9-08dbe4fbb194 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: pKRa8bGlHFGk6CpLdBU0/s2AHf+yU43lHrN8EwwdzM+2URHwxqWURmJJLqjLY7NHwZj+ALtqPvjjDlgxMDpk5Ue6LaYszD63I1Bx8o8ZHdsdtdQ/VsLyf0/H6H/VSz2yCffjWFcMm7YptGABP6rLq3aH4qFB68tWh2RdroZZ+cfYrORf9ADU0vE9vYeCM6yXMy95TgqnSRpD8oJK/tidS5s/U0ZvC+r/BhLLvJm/yykskJwm7puLCW5h3Xik4VrLPP3z4iqTh0R8HEsSPVL0+bB2cB6SzJQmn7dL+3docc/rJlz8O2wjA5dqKxE/m+tbSp+1cUXoEhOn/qot/u7VtgkHC5OWO4zVmlbSBJ6NY3XtxZ6qOZHfJ7MOflbCLfZ7Ozjw16u4oBlc6+S2DWeqzYRrrd6V2cdvjek5Q3EaKuFHX67RnGCGXcUVT7UZvA1XDLvD7QMVp2tzbaHI3R0Y99burW9QFmLBaiNywf+HtvC1PucwHADpMlMh36JOZ6Ms9+pyCQrhOwoOh2/H99vk6jbKRGrjlqG51K9JdX3oPfDMN7Vmt5HuYmCy6kclEhDx 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)(39860400002)(376002)(366004)(136003)(396003)(346002)(230922051799003)(1800799009)(186009)(451199024)(64100799003)(6666004)(83380400001)(6506007)(38100700002)(8676002)(107886003)(2616005)(6512007)(2906002)(86362001)(41300700001)(5660300002)(36756003)(8936002)(44832011)(66946007)(66556008)(66476007)(4326008)(6916009)(316002)(26005)(6486002)(478600001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?sfMEoN7tqVYFJM4+YmqVVHmtDN2uBVZ3GRbyUBinwoyvoqxowmUG8qu0Dktw?= =?us-ascii?Q?WLkfLCjFMydgdJ/neVSs7rU2P4n1fYPgO2F6KM0naL4+tqrA/soPMg/XohU3?= =?us-ascii?Q?i2hrIxECWoJDmhjKgkHQETlFyB6QBkZ6ipaEU/K7BiLj6Elji0Dee02RW6tq?= =?us-ascii?Q?fNIhjjcI/Jf3ms4RywM8mGI7bVh3Gw50ymMKxghdBVDRE0InCuRbr9ZveeNG?= =?us-ascii?Q?zOFkS95jsysNbC9ZR9Y5oQY5PLTsDRfHJ44bH/7R6wUkpsG9X8yPvi7T2Pnx?= =?us-ascii?Q?aXcJ/SMQlXhUTpxfMqG1M4w0mX79CN3iSRjgwrt8GDYIByFWb8JDgg+LQUk9?= =?us-ascii?Q?Xl6CoFMlwp3i6dCJDlm8sPAKpJqbC6OhF5LU6UoRHNoK9OsqHSpCy1b9Za47?= =?us-ascii?Q?zdIewAvEMBKGiq93SvSAw7IIChkKl/v7y9G1Ki39htoRexfwy/cn3Jf/fn/c?= =?us-ascii?Q?zamE6hvh8+im/nlEi5J6a5lgMb6ww/e95d0jvE564ke7fDEy9yuo7UMemLxk?= =?us-ascii?Q?1/upolHG2pOYeYOWjZg/9/bqvKuGLtjifw8cztclomzMbczcbEdi/LFSfCbu?= =?us-ascii?Q?KQE6qTodDPQFdA/MJplF+r1tQdTVmWUNHrN7CXJoiG8tmgm0KiQ2u6q5i7er?= =?us-ascii?Q?M68wrdaRo/5o+V2IgOFkDP9s4aasZLRUKGV+UfFDPbOyqe3KlvBuX4M979Z0?= =?us-ascii?Q?opTCpi9KG7UJEz2YxdmoBzg96GFu8uLEQsaHYM+sXLOsNdg5tJp+SRRBJ/Vf?= =?us-ascii?Q?ZWtkhyCcfS0ju6GBAJSek4BBjn5u2TTRE3wwWVjnVY4lntez5d5/owqLuz20?= =?us-ascii?Q?pnNbY13hZAWkpBVN/d/17t7cw4If93K7TEtZhtjWK+aGZqKyi8biwyL0i9lq?= =?us-ascii?Q?rJHLDitD8bQHUMU5Amniq6UoSEOCvcX8d3suEd1DDRh8Ad6w4lnIieO73aBA?= =?us-ascii?Q?/KJ3RKtqzxA36htsXIZFq9G4phaW/WFtNgKHZrBdLDsI9gI6XhWloFyvh7XJ?= =?us-ascii?Q?brvmcon39IzoYJF4vyE0Puao/oUcuLEiCega9kAm4ao0dIRzK0608j9RnWRB?= =?us-ascii?Q?UB+v/LEjhd6GW62d3JJcvY/NUYDtrtF84E547cmdSkhILIIM3jI7K4uJ5Zj7?= =?us-ascii?Q?CsKcsR+YMKIEIRKLuXz8GCv1538ypaJQUT3mXyRu+EVQNPFBV7k1sQ7fqs1h?= =?us-ascii?Q?1949wQ2wrqzCGooR4Xdl0gmGM90vPsVYQkFntxsexCOYK/MMJmsj6uGOM6tH?= =?us-ascii?Q?mePebVIr63SaO8AhpMCdazjnBUu6cxevGPJEwbIy4QU3VJ7i1zXP8z6Rzhor?= =?us-ascii?Q?wqNcAO/4KY/zYVjaZ/jWfEyoXW8GQKLRwCi8yU37YB0nHoXDqVNO54qQeTbc?= =?us-ascii?Q?b0MeqpWUUJ+3GSBUnasbeOKncvCNK+IiaTZMW0JAdq88+mquICLE/3RgeWke?= =?us-ascii?Q?8B6sbTDdE/EGXiHU15LOdVKIQkdzVyrR9YZZacvvL0mIr4Vwhq2D2s5+dFoZ?= =?us-ascii?Q?YbKLFn3UctL7+ni+LCi4S7nZBBf5atC4UjMmw5t22QgDUx8dyU4ayQjX6TSx?= =?us-ascii?Q?9MiKEqVDWhvrKwf5g0hyxYi7AEUrqgnV8rdWcsLMT/PE7EbtiywCMxPCAm24?= =?us-ascii?Q?gQ=3D=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 484b2947-9f21-4e6a-23b9-08dbe4fbb194 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Nov 2023 10:23:07.2048 (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: y1kTeLniUi+8CQDN/wqahHsaa7/I3bZWIYvLDZRb/xAlSwcU67NkOdjGHMwVyz8jAQmixCEQ2UhStlD9OiThBA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM7PR04MB7013 Content-Type: text/plain; charset="utf-8" Use mptcp_lib_print_ok(), _warn(), and _err() helpers in script diag.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. Signed-off-by: Geliang Tang --- tools/testing/selftests/net/mptcp/diag.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/diag.sh b/tools/testing/self= tests/net/mptcp/diag.sh index 3119811018fc..7cf1f602bf48 100755 --- a/tools/testing/selftests/net/mptcp/diag.sh +++ b/tools/testing/selftests/net/mptcp/diag.sh @@ -62,15 +62,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_cnt fi else - echo "[ OK ]" + mptcp_lib_print_ok "[ OK ]" mptcp_lib_result_pass "${msg}" fi test_cnt=3D$((test_cnt+1)) @@ -111,15 +111,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_cnt 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_cnt else - echo "[ OK ]" + mptcp_lib_print_ok "[ OK ]" mptcp_lib_result_pass "${msg}" fi test_cnt=3D$((test_cnt+1)) --=20 2.35.3 From nobody Sat May 18 12:05:10 2024 Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2086.outbound.protection.outlook.com [40.107.20.86]) (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 0D2AF18C1E for ; Tue, 14 Nov 2023 10:23:14 +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="NFHXEJrI" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=d76+EuLwRlrVQtlZlYcN7VKeNYHorMtiD9PZ9EHA/RyvBoQ/u3/1HQYv59rF2ejHIK8jRQffXbuJBHHIWhf53zJugFN7pF1AxrnJBALgzn5ahrkrOc1jW4sDnb0rqyfLtwa51S0kfw8Y6s4RLVHPBjesECPi1Ago75PbveYAodl4PsglGooMakW2pnXv2hCHjHnAulPpYZn8OoFVeLQi0SFYpgl2RWD0lbdQ9rAnbcwMJFRdqYWYknt2VFKTiDXZbOkkG+3j0iRZb1dk/jKgnjOWH7REFAaoWkRVSH7kmoCh+qHPHTAdh+LUPchLkmIYmCDiQWb0d6pHhrs9aTIuEQ== 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=moBAUjw9K4TFJZP0DrfY1hMBYNM6GAtpA93ldHiEbuk=; b=GTCo20JYjkjVbqgiFz+pjGjiBtgkDSdVx04Zh5Y7qh8Vi0KZX/Tp7VoHUMRH5c8ZBdX+HUfPpJkdOF/A1mecB1dy/NtM52V2AKoW5jMA3iRwtQeMkwn1l5pRHjyD8dt+H7FKYm367jCZ7HGVi7j9YvRwKTw135Y2B5hW9fm96yIVvWGnTOfVhuSvoCgOlGZGOI2mlC5gD72qEmICFkA+3DOjeUNds2bKhN+2vH5e5Qa7y4ikTiZcr/iXwd2V+aOi/nEE4JJURlTjCoa8ChFjWSqCxqWlS0/sta01pi/c0lsq6O4AmDAcr2WjGsCQV/QHVTF5mzw5cNvremex4b/7fw== 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=moBAUjw9K4TFJZP0DrfY1hMBYNM6GAtpA93ldHiEbuk=; b=NFHXEJrIWvMBXOTpRT6NqQGATt9exJb/7gAbr3paFEovmS+TrrMCOF42DoVvTuJAS3y+dAG/uVn+T7YSWAXjV9f0SlSPdNraxlt1HbANR0QW9xSxPdAF2pS/H/pONaMNjzYaZwdThHw0F9AEW3zCOKYFManr1sbXH3EOhBxfZqBVobsk28YzspZzMo5PEU3zjUD8qsCu4liKLSHvH+sf4WPmlleGt1xrJpZIDDYhFovcwMlIkgZpiTczDUJ+sgJ5eRwH09hIEAOD0p1KmxIm+yp57Bvw+Nxi4bYpzFNntRqdswKuk3yD5jFSaLCrqQZofxC6aXakYPm14eDkqzusqQ== 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 AM7PR04MB7013.eurprd04.prod.outlook.com (2603:10a6:20b:116::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7002.17; Tue, 14 Nov 2023 10:23: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%7]) with mapi id 15.20.7002.014; Tue, 14 Nov 2023 10:23:12 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v3 13/33] selftests: mptcp: connect: print colored output Date: Tue, 14 Nov 2023 18:21:43 +0800 Message-Id: <38c745bb6198479f5bd4b3cbffdaf5681e9d488b.1699956980.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI2PR01CA0011.apcprd01.prod.exchangelabs.com (2603:1096:4:191::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_|AM7PR04MB7013:EE_ X-MS-Office365-Filtering-Correlation-Id: 81c0ec65-cc09-4cc4-d6d2-08dbe4fbb493 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: T2leWKS1RZumj1g0CLNdb3voGJKrcbh/GvkbIx0aKVtf1CS7T7fXlxE03NHRnPqyQ32H+Jusyqzqa//cxq4pgyDhZhnChnfhXTjlxk6Tx2Y0HzfjtPlVodw8w5anC2no4Ny/3fS4wGc+PACySWDVevn2OhePXlPPQuPLE1p6+SGo2vPrEPlnPgiHM8tcbCt7zxWl5Z4mfYC5BP4XKeJg4MNAL6YY4kUIKjb920RUZyS29lz6QiHGMHOoRTpriBazpRGM6zczaUlDFbItAsfuflL1ASkxl3TDNEmL11s9hOfdBimqJhtvqPlv0KKi89meCugJTCZsBddoQQ1+MySH0tt9ZBTRuOuDjRno6isJc9LvCkxBYAE5dnyWrOWFFQfyT4Ip4FE/phq5TgaQUWnCYxpxr/P6wl67QyXzBVv+AgGhz2J1keWSL1YEd0HdmYhfKJ3xv1UhM5mwhF9rJsUa7w+tO1yw+MCP0YTyJDAT7mkouvC1rO2Y+mMGtNlEQS79yEiMwerBFh6U+/bfTlQUT8d3od2ZCqwcJGU5QWvmASO3ytqC/YtOt1Wo+R8UeaR3 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)(39860400002)(376002)(366004)(136003)(396003)(346002)(230922051799003)(1800799009)(186009)(451199024)(64100799003)(6666004)(83380400001)(6506007)(38100700002)(8676002)(107886003)(2616005)(6512007)(2906002)(86362001)(41300700001)(5660300002)(36756003)(8936002)(44832011)(66946007)(66556008)(66476007)(4326008)(6916009)(316002)(26005)(6486002)(478600001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?Z1QoAU66MNDU2PSkRtM72Wz1VDC49cyLY+xTeEpARoy3Ch+kAm6FWqCaeOQ+?= =?us-ascii?Q?Oh+uZxwnjnFeosp3OLtmRy76B18S0Mezq9Sv0jB0pjAG6SR8DPn83bqO19B/?= =?us-ascii?Q?XAQ5UlTvP9IXP1zhfSp9SFHc+78aCczt/+DhtXV4Ifrj04LSVQUIDF4MmAJF?= =?us-ascii?Q?lGJovY+HoV1O+YCnIns7hIKd24ZhruyB/STSS5YEK9yrWzmR8CvQeQ8DIBDf?= =?us-ascii?Q?uYAts6UdP1CyehmdtknDLIDL3o5UBTYMvqCY9Xw0JKGv18AjJUiwjzcxyhgM?= =?us-ascii?Q?FFnI1VP105pJMr4UZw6p6d8hmGeoL9keHc5QJUfnD18QHE3VyHF1Co7xp/Ka?= =?us-ascii?Q?gSsHdaWlaHupm+EMX7wxcRtZgXx75EMFX6eKot3pEjPcsWSSnM628YmKbjxN?= =?us-ascii?Q?tPtCJeoQC7qUxfDHXeog+8x59JFoKC0vqyjMWIe5e0vAkeSWVxs+/pSq7+Ab?= =?us-ascii?Q?b0J4NOz7TYmZTt1nzUTwLAOpH0pvoWZUujRG+SFuGRXpjyKyIk8SCfY754fH?= =?us-ascii?Q?lu2bcO66ctyqKumLfV3kwYttY8Nvu73zVYKGmyW+YOtuqGa5LEKYCDRjQmPu?= =?us-ascii?Q?wQNzfH3TBx/lyv8zmZyclnoAgwlog8m4Uq/lA9BMjv6AgaZWXHbnUfnC43CJ?= =?us-ascii?Q?GN6nitPGAeKmnIvSSj0T8dBW94BaKn7zgn/hOBpnw8s3XXWVHXAYWCfhjjAv?= =?us-ascii?Q?aIqEJeSqrEFwvcSC4KgfNpm9Qj5D+/au3jlc3fqLbaTG+qgKVSTl8++beLPK?= =?us-ascii?Q?0Y9NPrwo0RnLMcocwqTnc0hExxVCKnGLJsbeOpKvYVAl/962P++fGUAHykkt?= =?us-ascii?Q?CqB1QBA/w2ra0j3nZgHafTsTeisyupFlWtY0refZzFjQc4ChKqDmjUMqBqAc?= =?us-ascii?Q?NJbKXLM3vEzBheTkYs83Pd0jdGShoskERJxD4ZvukddQuEJ0mRc4fKV5PFbB?= =?us-ascii?Q?AOLtL7quKC2C0Hxcgf/Tmwv/RBKbWZBXaivt0KiPu8Fq9SITALqladZrcUEb?= =?us-ascii?Q?HUs9NK7me/hc2HXfpud4AekBQt2vZwWksX0X6ufRxAaPQi0BC+x5ULmzqEYh?= =?us-ascii?Q?tdtJ25LgXr75QZF2UCzDPVcMt0a6CinJ6T8XVVaUQ2k1PAIE4vGUvCSFxfV4?= =?us-ascii?Q?jfm9DByHqbJurm2wr8BX8hWrMuiJW3B6FO9ENtQhjkFhNi4V7/slfzqItMuU?= =?us-ascii?Q?0eIDvicMGhcqAmnUHU7jZhjl9lFQBynxBkk7bBb2wp4OrGNUvkhR1LFbUDip?= =?us-ascii?Q?/9MpLyheQmz6MYQTZGlTOz1VatyjNwTS9q+V3HzbSaCNsFDWhL0+7qMVyNqw?= =?us-ascii?Q?pYhuppwTZFoSdyPSQxeiDCxc0YSequqiAcwVXCNtgveWIEwJJ0pXdhGlw3gx?= =?us-ascii?Q?Yi24DG3RAEXBiKhC2nYuIO10xWNCeIf/V/VYkEhRi2I62wJ707ph4GP2wggG?= =?us-ascii?Q?kLfHcdOqLNPP58zU6beiwiBrLgn3jC0ONGyrMtKNcsqjZrkyqH7HL37PWudw?= =?us-ascii?Q?QUfUlPS+dim9oKfW7+Y6Jia8PP27ymyBLY7OcaTLrsevJ8ggmL64+8RDkPV/?= =?us-ascii?Q?UUSpGlVZsvsS0vJ6EJsUo8nG0ecjaaVkEhX70oNUpLbi9Yd5LMFnNWLPjGsl?= =?us-ascii?Q?Pw=3D=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 81c0ec65-cc09-4cc4-d6d2-08dbe4fbb493 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Nov 2023 10:23:12.4606 (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: 2vYAXwm7QQtsbcS8IpRotIoNEMteu6H1/1BQnAKhtT2OITQ0b6FeB/IHwSWyPuHjUBRoyvmqtURapkYaL6bk/g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM7PR04MB7013 Content-Type: text/plain; charset="utf-8" Use mptcp_lib_print_info() and _ok() helpers in script mptcp_connect.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. Signed-off-by: Geliang Tang --- .../selftests/net/mptcp/mptcp_connect.sh | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_connect.sh b/tools/tes= ting/selftests/net/mptcp/mptcp_connect.sh index 5e0263e691a8..4041414c8804 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_connect.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_connect.sh @@ -266,7 +266,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 } @@ -482,7 +483,7 @@ do_transfer() fi =20 if [ $retc -eq 0 ] && [ $rets -eq 0 ]; then - printf "[ OK ]" + mptcp_lib_print_ok "[ OK ]" mptcp_lib_result_pass "${TEST_GROUP}: ${result_msg}" else mptcp_lib_result_fail "${TEST_GROUP}: ${result_msg}" @@ -513,7 +514,6 @@ do_transfer() "${expect_ackrx}" "${stat_ackrx_now_l}" fi =20 - echo cat "$capout" [ $retc -eq 0 ] && [ $rets -eq 0 ] } @@ -689,7 +689,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" @@ -716,7 +716,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}" } @@ -731,7 +731,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 @@ -743,7 +743,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() @@ -767,7 +767,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 @@ -816,7 +816,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 --=20 2.35.3 From nobody Sat May 18 12:05:10 2024 Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2085.outbound.protection.outlook.com [40.107.20.85]) (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 17DD618E30 for ; Tue, 14 Nov 2023 10:23: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="H3a3xIYo" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ehLUZHqnvfXwJZhJC5iISk0rGWpeRkQmQwW9HfRt5mUA72QNEqTadrfb1ppcfj/IhZOE6Z8qHUe4ffTDE48Is25MYcYzni3LugV3vSDRwgL3NkclZcbOFNIwiotJ7OdchH11pnG1jyP489oq1GWZPTA3IaEAdscpYLp4KKZYWKo2/t7rEtWMv+dyQ3Nh2CI3E2focNIY0zBIEqmXHvjG+AItv2BjJmd8yUR+batAO7aMdULYJ2HJ8A6EKYlhvpwG1yUKYPsGpaIye7VZdbfK9hHfZL+Vy10AM1Cfih8jjRuvBuNwtU0zL1Zq9D54eMdVq/Y0lIyhzImtJ+bT9HSssg== 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=FxHgT9FxW4/HB371HaovJX80lhRmP6QF4+bwpKBgNBU=; b=JPleGh73Ix4n3HT6ZB+r5Hv0DUcmesZMU2zCsNni1Vevzp9QMMTr6GzJmIuv4CwN/Gy9VVH5tUAYJXRU+WLjoTa73Lnf+69SuG5AB7ElXAbY4g5MB/paZ4vxOHug6oqykTzqghNQkDLOYPqBqVqh4vjMNWm+nijjql1OFNdcDVPqhjNOGwUxsWS6V8OdT5Cl7q5eG2O1M+/HOrMGpBynDe63DHzkwqClmsvDI4h9/QdGwGO94vUj3QPG+Fum4f1X85WqemE10jdlIOfjZ4FahtSJuIXc0yGJBGSvHKwTuRDkJ+yvV7v8PDrdzNazuqvXLicX27x1m7Vday2Hw0E1Aw== 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=FxHgT9FxW4/HB371HaovJX80lhRmP6QF4+bwpKBgNBU=; b=H3a3xIYo7fRewQCfYlEMqRwJvEaGOEkabgLPraIE6OZXGp6BKzLB9OSQlJkkxYrnpAjMYlmGrFrHbtGfiUj7l+nN1+iMwAfwCql/Y/AAaZBQZA6q/zwjkXKe9SygGDhk5PyI1bjqGCdTnmUPyLuw1KJZvxYoY7MxUD28KwWDS3VNzBB5fLlxdWQxcM/MfftmaSEFc5HeW5nRoILjffPaKUTP2iBkWRpyFK9OnkGJhH0E8cFxr3v53uJ+J5Ylu6+//sXM18CioDk3w5HB5/OyNB/xmXV2U6SzlqOVeubEJbz5BYQh3V4tAIrEOqbV7Lh8W87RR+zo0CArQ8GpMZwTmw== 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 AM7PR04MB7013.eurprd04.prod.outlook.com (2603:10a6:20b:116::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7002.17; Tue, 14 Nov 2023 10:23: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%7]) with mapi id 15.20.7002.014; Tue, 14 Nov 2023 10:23:17 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v3 14/33] selftests: mptcp: sockopt: print every test result Date: Tue, 14 Nov 2023 18:21:44 +0800 Message-Id: <5f578cac58f25eaf58b4258be0a095ce67e54bd8.1699956980.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI2PR01CA0005.apcprd01.prod.exchangelabs.com (2603:1096:4:191::23) 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_|AM7PR04MB7013:EE_ X-MS-Office365-Filtering-Correlation-Id: edd67728-7ac0-4c17-9dd1-08dbe4fbb787 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: GTNU5Ra/jPNH/vid6cARknja23u/PY8MvcACrlo2p3qQ9MrK6biHajQfo6ko44dCVO7vk7vzXfFITqd/jI//syrI2Hijbdp7+DDU/Iw9aUW60hIu/8Rb8gwfv61Z6OGeZf1gL7Xv+FpEGYgaqBfPKC/XQyaEc+sGCthGFexUnC6MdL9uVj+OH1rb6RPpmOZdxNbNl4nCInjNdD4nYPHL8NnOIzkS5hCWnHeacYx3GVyJVTs06agRQPaw9ueX1M1nzYfuZs1afd6Fm8kW7KW9gnnlhdCmT2qna5Ic/UM6akqOqWOxvJO9GZMSP7J6fduqGdzjgCRwzJa1rnIPJYVlbaFE0+tT22h5iX3s7rjvZ3YmyJBX8xBmdodJ7pnf9JoQ75vKk0GtnF4huLEWyQ5jU8bv5OE1KRtbeVdDii26pzY8swjRGuAOOeCq8+EvDlzT2QXVNR9ay5kXvWTjnsh/rcV8pF5Qus0B6/OIhOclpIzSM0Xco3DtEuUZD0w7wp5n1ln3/A46phppu1hWUl17++/dlwDTNaoOSp4/YhHwYRgm+jbjS3hOUiSdrFkHwtOc 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)(39860400002)(376002)(366004)(136003)(396003)(346002)(230922051799003)(1800799009)(186009)(451199024)(64100799003)(6666004)(6506007)(38100700002)(8676002)(107886003)(2616005)(6512007)(2906002)(86362001)(41300700001)(5660300002)(36756003)(8936002)(44832011)(66946007)(66556008)(66476007)(4326008)(6916009)(316002)(26005)(6486002)(478600001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?Zns6TmKqP1+8sgbLDBXUzIBFFs56H/8gBCsWrPu9PEQY2vcEMrx3q9k4BRQE?= =?us-ascii?Q?GxxPWAZP+IIE1yaSZyf2k93Rf1/6QiZN8exftn0S3/8b6ka0I0YVVg18sYIV?= =?us-ascii?Q?8EXKt68e8mLa8mq0m0VSfmIXnU24MPwuooZtW+d+b5LcPELKLAIUdHMi6GBs?= =?us-ascii?Q?9My9EgrIhz4u8pQctrwTOj+no+5M3TPoyX3zn4IwTHPZ7reMTztqaDO6sI2n?= =?us-ascii?Q?j55SLAL0BhnB8f7LRC1IcUWiWCrwdpbzf2mC0YD8eh4etMLmUiuhcY+qjM12?= =?us-ascii?Q?so2XMFQ3CPasRCaEFO3J/zDEoD4I9bUAYOZj/+ByBHYzBnkjuvUW+4QQkbtA?= =?us-ascii?Q?uYGVySZYvkTp+32DQnFfln4RExsUKZCsZMtprU4NqC7G1LXFaniA59A8S7gI?= =?us-ascii?Q?OeJHRBeZdWyKjk4HkX61jBl0YHykN/2/Tn1mWgosSyWtuMGEUmzIM3kdkCWM?= =?us-ascii?Q?JFWjudzqsVC/UmbsMGBUHH9UAdpcOjL2fpJ7sy/u4Y41wBnlreUOZoZex9mJ?= =?us-ascii?Q?+YKiphqyWn4Z01SjP1ZRVroG4eJTK7pjfohIX+El0iAIfPyIGwxuMLz4j4O3?= =?us-ascii?Q?pN/Zof4k+CDXIWMumLdB0mgUUwxZ6AR/J+lAGBOD3jU1IvNv/20jcv3NrsYw?= =?us-ascii?Q?tI6g5piKTAQfPrA0agMX9gnIlSrYk5Moux0bwKZSLrVuX4iGmUbUHl4pRoQF?= =?us-ascii?Q?d1oC5ycWRMNiRffkmB2Zkzx7eKp1kt+z2r4fBlqUjnbvfejWMUR+tsfKKDFG?= =?us-ascii?Q?O8fIhMdei7M9PtwOOm9T84ycter1oBbZZvzt0VmWzBQZSFiVpS5FNS2VKyO/?= =?us-ascii?Q?GRfeDwAbXNfV7HfXBD4it6jQqvPUo9D8hx3SGY8oar74S/X6OFK+1GyUnb16?= =?us-ascii?Q?MDuPj7EK+G/iVcS8BbXmlgQSPNhFiL1WHZT9BaVfg86lkQOouVJKT1fPs9qp?= =?us-ascii?Q?XGWPFWGbOj8WY1fEK/JE4NOPWDCDKwdcZN2TBFNR/KzcocYHT+q/5yMEPNb2?= =?us-ascii?Q?GiMBVY5o3ephPyLnGQNSMFzthatvPI6n4HCtG1UL7Rvu83nzwGz1ShygcWty?= =?us-ascii?Q?cXb40hgHj2W/8yONV1upkPVJ2404NWQJ+H61E1E13WoG6dAoXWw/HOrZCS35?= =?us-ascii?Q?nDedGXaY0wU0TdckPXPDwlmsE6LzHh0onNjHv+Mq1oxXP/V0N98YMEco7AiU?= =?us-ascii?Q?h/jGKWHRdkm0UWU3Aj5HWH3Q7bV6kxx8sfSLkD30OsQhI+F5uHvbWatu3C+5?= =?us-ascii?Q?ULvvpSLxb5QJPo3qLogVuVsXB2irN/+hBW3/Wz/6JlMfkZ8s7VVkQ06K8Ts9?= =?us-ascii?Q?Z9x+RFozq/Fvb8G9+DsYn7Df+2Z2ZT1rllir2ziVQ2XdHutHpRuWUCP20Ar6?= =?us-ascii?Q?5PmxyS2MzvD1CwVKY0uZlolGHIgnkG9eu9Xor2pYXutonrqxgIe3VfgVNQl+?= =?us-ascii?Q?reXWgs/bDCxhgSLBHe3F9qrs9NjY0oIFDEZuGBgR2UekSmKWlD3I6CeI1Aem?= =?us-ascii?Q?ilDbW3nMBAtJlbMP4iAlGzi7nIwvNcB9PaDzTfW3fwBr1lPfAk+dtT+lmVWY?= =?us-ascii?Q?n1L9XH/o/Y3SjF4gUoZD5h5CuyKCMmCYxxk/i1YAIp3O/4wGfvWyYvfdrDjP?= =?us-ascii?Q?pg=3D=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: edd67728-7ac0-4c17-9dd1-08dbe4fbb787 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Nov 2023 10:23:17.3780 (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: tcR8020rfC2pVhSN+reye2YElIOsHwritxZU/mvvqIGneL/sBj9pe85SXpXu21tkG/KIEALlG5H/PYPim+5TuA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM7PR04MB7013 Content-Type: text/plain; charset="utf-8" Only total test results are printed out in mptcp_sockopt.sh: PASS: all packets had packet mark set PASS: SOL_MPTCP getsockopt has expected information PASS: TCP_INQ cmsg/ioctl -t tcp PASS: TCP_INQ cmsg/ioctl -6 -t tcp PASS: TCP_INQ cmsg/ioctl -r tcp PASS: TCP_INQ cmsg/ioctl -6 -r tcp This patch prints more info for every test result in each test group: transfer ipv4 [ OK ] mark ipv4 [ OK ] transfer ipv6 [ OK ] mark ipv6 [ OK ] PASS: all packets had packet mark set sockopt v4 [ OK ] sockopt v6 [ OK ] PASS: SOL_MPTCP getsockopt has expected information TCP_INQ: -t tcp [ OK ] PASS: TCP_INQ cmsg/ioctl -t tcp TCP_INQ: -6 -t tcp [ OK ] PASS: TCP_INQ cmsg/ioctl -6 -t tcp TCP_INQ: -r tcp [ OK ] PASS: TCP_INQ cmsg/ioctl -r tcp TCP_INQ: -6 -r tcp [ OK ] PASS: TCP_INQ cmsg/ioctl -6 -r tcp TCP_INQ: -r tcp -t tcp [ OK ] Signed-off-by: Geliang Tang --- tools/testing/selftests/net/mptcp/mptcp_sockopt.sh | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh b/tools/tes= ting/selftests/net/mptcp/mptcp_sockopt.sh index ff49ee9b9cc2..f445fc685b86 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh @@ -173,6 +173,7 @@ do_transfer() wait $spid local rets=3D$? =20 + printf "%-25s %35s" "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 @@ -186,7 +187,9 @@ do_transfer() ret=3D1 return 1 fi + mptcp_lib_print_ok "[ OK ]" =20 + printf "%-25s %35s" "mark ${ip}" " " if [ $local_addr =3D "::" ];then check_mark $listener_ns 6 || retc=3D1 check_mark $connector_ns 6 || retc=3D1 @@ -202,6 +205,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 @@ -232,23 +236,27 @@ do_mptcp_sockopt_tests() ip netns exec "$ns3" ./mptcp_sockopt lret=3D$? =20 + printf "%-25s %35s" "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 + printf "%-25s %35s" "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 @@ -271,6 +279,7 @@ run_tests() =20 do_tcpinq_test() { + printf "%-25s %35s" "TCP_INQ: $*" " " ip netns exec "$ns3" ./mptcp_inq "$@" local lret=3D$? if [ $lret -ne 0 ];then @@ -279,6 +288,7 @@ do_tcpinq_test() mptcp_lib_result_fail "TCP_INQ: $*" return $lret fi + mptcp_lib_print_ok "[ OK ]" =20 echo "PASS: TCP_INQ cmsg/ioctl $@" mptcp_lib_result_pass "TCP_INQ: $*" --=20 2.35.3 From nobody Sat May 18 12:05:10 2024 Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2078.outbound.protection.outlook.com [40.107.20.78]) (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 9889C16412 for ; Tue, 14 Nov 2023 10:23:25 +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="M1Z9jI75" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Eg/2OPKpkJz7r/sxiOqGlta7To/+KIdsF+hXNzdWCjRFPcSjMf+6D/l19qV8vIhqbIEtBIRZMBzwMFdNbX4MiBc+Z56ZJoSu7Xu+IZRQgbAb6i+u5fObCGX0Hx2qbzlA9P26VUMWpomVTgi3b7T3P9crU0NUgoJkXjf5guekFmceys1oMXTngOUEoqp0B5EqtSTr9/+6qRXJEt9+370aCDut0as7KTbg8EcOuOwDaxi0AhUKUSG4CA/zCaw1kNBFZxMe7z/1IsikHFOXC4Z90KgJ5RHiGfLdkVdcAsHg606hZjr5RwoKNWFwalPSQr9hHa3iGuB1xjKkEItfGMA0sA== 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=Crt14c+XfXZGr+AztNhi8cZ3GTw2J6SRrvjLnY6374U=; b=ZQ/enwKJjBpIOEqbynlQCQSerwyx38h0x3LvXgZyMD74Wsw74YTPzriss8CNr3ZtVTzv50zyhZX3rcNysFKHCY9Dqsqms7LaYqAIem5nu7wKjP5OeaJff2pBKLxkZ3JxzTpN+Ou4wq/tYD9+ozGwVQ6OIIdUAbZeN9QAea1qKaXT/7WI3RNmsOFkQLjLizusKIZ3D7nQsy2QRkZ9g7N585BJhvOV2a1A6MFY17PWgVRU1E1whZfbh2CaGyutjpxVsrOJR/Cn5I4uNwt6YA+/0UgJnOoFY/h4Vini5jv31WjSc5PeWaTG/c6sqqEL0uP0TW7UqAVnLkThYCMgMXF4wA== 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=Crt14c+XfXZGr+AztNhi8cZ3GTw2J6SRrvjLnY6374U=; b=M1Z9jI750lKAPmMHn1j2ieDQH1fdvHXDV4k3lLfoVHloRzU8eXGQFxzwhExzCMFidb1cyk/7kF3uWt3ti5Lp4DT5Tcxva7LY3XtP2LTyDyD9jvUSH7TPKGtTijVqGTM8nJeqO5COrMdWxLR3NDzbGVcS/PgURzhGmrKQA7x0U1DzdhSjYwyaBfZFR3l8BCdS9S3NyfO2yGk5E1GaZpYwT3GpibD6Y78+SEKG2/p5Ps7m6x0pfWJRKSTq1dYW/L6zh89J5lbburQCKcSIRGkA/+RtJZOLSMVebjLiiawtSo7ReX0rQ65kor7t1stQcxh11cyBXGoDP9dEeU4ZPZAnNw== 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 AM7PR04MB7013.eurprd04.prod.outlook.com (2603:10a6:20b:116::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7002.17; Tue, 14 Nov 2023 10:23: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%7]) with mapi id 15.20.7002.014; Tue, 14 Nov 2023 10:23:23 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v3 15/33] selftests: mptcp: sockopt: print colored output Date: Tue, 14 Nov 2023 18:21:45 +0800 Message-Id: <1c38a69593f0c38a5f18fe21a3974ee2cebade9c.1699956980.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SG2PR06CA0249.apcprd06.prod.outlook.com (2603:1096:4:ac::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_|AM7PR04MB7013:EE_ X-MS-Office365-Filtering-Correlation-Id: 2c656ac8-2fc5-470f-d0cb-08dbe4fbbb4a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: tgYpiGqWlsvGc0/jb7nEj3CSUfhvmvn/cLw1SO3oRGvCOvOmk3PHRNaLK6fHQ2LfaKVaRzg8yLwvZhGG2MSxTrkuCBehrFqZ623lM6/9lj5fBmXodaOMoV927C3kS+QWCLJQyDohr5+41AEsIBThyEytjj+RGSTUGfFJswtnuFtnkXK8CoxEsJ7lL5o+mRhHUmBRT7KS92V72bsGfrg+m3yA30EMtSlAErj5MH1hbxUu7pH3V3myjc2ROq32odLWWerj1agbhtVdSPrPcsRbCQ/nrQHKWb5mBILn5nAJ9r/RJEpi9/kPFUVguAyL7Y3HX2aFKyc9dzjrfL6JTBixyZV7UqaX8R7kNaL9/zt3Cud+AXYp8J0vB3RkosM3WpjcdcynZFJy53gEJsL1cE0ea00MC+N37p0XUNFoyQ2FzaLTrd1e97R1cEYvwaQSdFUXqx+73axBnlgsMw+wECVk74m1fSJ1HSUpFv2Pmt1/+BslmF6ZOBNlrzlJ2A3jamxOhc1TOWI/NTGJ3DNouV5Gnrv6khSzJcWGgSaWzTqZ/VX2DVH6oesXa3qA7evJMKYf 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)(39860400002)(376002)(366004)(136003)(396003)(346002)(230922051799003)(1800799009)(186009)(451199024)(64100799003)(6666004)(83380400001)(6506007)(38100700002)(8676002)(107886003)(2616005)(6512007)(2906002)(86362001)(41300700001)(5660300002)(36756003)(8936002)(44832011)(66946007)(66556008)(66476007)(4326008)(6916009)(316002)(26005)(6486002)(478600001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?sd95ywBPYM5jKP/cbE6pkb/wuU6DyaEgXOROnipNTYfpDJKbz4fJK7lWXqg/?= =?us-ascii?Q?aEJjiy+mX6zEvAXVjsULzymgIKIVCat2oF4uupPEDSGOpbc4QChgKDo6GImH?= =?us-ascii?Q?C260CfxOFIhcuMvzDjG4GofCUijVtICC4wSaHDA+XeSQ0xofYOKnTtMhYbNo?= =?us-ascii?Q?UnOgLW1SIIwEW3TSqP2ZJ+WapWFSS0QrSVqqHvly0VUNnlU4y6fcQm9DqL4K?= =?us-ascii?Q?EePKWvVxFEym3u6bfaBfVkIxeGncFAp7+hJE+k2sLuiVaz5FN5RKWP9e2BNI?= =?us-ascii?Q?Uc434Jysech2H4RvwJaStk6kKrRBrovL+vNq1jlo6ej8b3z/rmssbybzP7rN?= =?us-ascii?Q?L6wQxD6r34N5HcWxw0Y4uU9iqbvRoqnRjiAmA1NZCRlUcOX2YddVpA0MfpiX?= =?us-ascii?Q?YP5HjkRo4zI319qANvsljhgt2kD7nHHh8wqK4vnFJOtqKrx0GRaFvzz1asa/?= =?us-ascii?Q?DoDb0VX0rcAsjWI4n2NCSlQQJgcs8sRy4bJNcDXKrrJCK31g7RwuGIv4SIiX?= =?us-ascii?Q?oca8ak+TBS7CFIPINcLWRWQY4sBBRj5ju+g+6e5c+uu1gTmBghw7KSOkNdH2?= =?us-ascii?Q?u/66BsLVltKe8PngbtJPOOn4CzGyWoZwR1yHQMMtchdvcI9yFnbc7VRPWzGc?= =?us-ascii?Q?hXXz5zNTl1EWiFywwHALF+zqwWkVJbAeZt2iwBwMnvPFiDQ+FqTnpuQBiAYF?= =?us-ascii?Q?uRuMpI2Z9fRgpCRPnuLl8z48caQK2ar/uyziugH5VPeBDZEqQJzOlShaNAM7?= =?us-ascii?Q?2wBxOW9bp6zbNb/IFH7nyHKAMbxY9jIrfYWI+BuWM+zvHG/blCGgmlr/S7Xh?= =?us-ascii?Q?/aymAUZpl+agrjirntIC2dtTjYA9oMB5ldDSckLsuA0iTv9VHstVbND/ao3L?= =?us-ascii?Q?9yD/NEZONXgYLu4IfNT0FR+PvGUPvCLg8jchFmFhvF8YMyfMMaxCDq64U7JW?= =?us-ascii?Q?h8BND+CCybZcC60m4glPCKdUUoLMm46znEA2n2p3lN1In+iRYTEauMJU375+?= =?us-ascii?Q?XDsjHxLJ3iSlgSDnFQeLvF1qAX/AgWsdiYLqiKDZRlPumVcLKpZjs1FmtHoG?= =?us-ascii?Q?vdyiNMcNrho8FURe33F2Nsi2yFGVvgHy19kMQ70hefJB7Iu0q+sndHVQUjsK?= =?us-ascii?Q?Lk4zNWyRuPs1C8JDolgCiN/wcvnXCum0aUqc1G2173IemDr8K3Tp39/VGkJX?= =?us-ascii?Q?LFq3PKjdpv9NbCw0mb1okn6p3pdFeUxy+6OEau2L+U5GmPimVb4CL6Sb3Ey4?= =?us-ascii?Q?9HC+6i1VkXNjNMGdcf+IKPsr6WEXg5409OvEhtfbst5SZw3tObFMuk2k38pV?= =?us-ascii?Q?GdfT2vtLGTo5lZfZZum1RE5arNpgREJoyoXUwhHLkTe2+3mqsNo58lLTJbQQ?= =?us-ascii?Q?BXJa3F40zFPG4Ov4B6DoyFrrl9+ojdu8OS0qUKUhOLL5HGqH0I9j4fS4n3x5?= =?us-ascii?Q?WyHQdY5hW0GO8U0uLHHTVNW7enR2p+mYUnq4D7oldVDcBIwWQvJ9238cFtDm?= =?us-ascii?Q?h3fWlGUYhUI9rKyMz24gLn8edW7y5HgDr8L4Yb7X7oeJPaxbm8bNMR6S4z/k?= =?us-ascii?Q?FfBzXw9uMd/Qz3h8BsP66s1n6YMdzKguN/bSCkwa32OvNUjeMH7M1LcX0YnS?= =?us-ascii?Q?iQ=3D=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2c656ac8-2fc5-470f-d0cb-08dbe4fbbb4a X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Nov 2023 10:23:23.4181 (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: mLSEabnyXWWGAsMRtQTuc5MhVH5jQpCm90a1Pc0L9mzz3AJAfLX4Uq8EldtFvQjd8c6VVSYFp4YItJJrXtqoYA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM7PR04MB7013 Content-Type: text/plain; charset="utf-8" Use mptcp_lib_print_info() helper in script mptcp_sockopt.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. Signed-off-by: Geliang Tang --- tools/testing/selftests/net/mptcp/mptcp_sockopt.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh b/tools/tes= ting/selftests/net/mptcp/mptcp_sockopt.sh index f445fc685b86..d03f9f9daa39 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh @@ -290,7 +290,7 @@ do_tcpinq_test() fi mptcp_lib_print_ok "[ OK ]" =20 - echo "PASS: TCP_INQ cmsg/ioctl $@" + mptcp_lib_print_info "PASS: TCP_INQ cmsg/ioctl $@" mptcp_lib_result_pass "TCP_INQ: $*" return $lret } @@ -337,12 +337,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 --=20 2.35.3 From nobody Sat May 18 12:05:10 2024 Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on2077.outbound.protection.outlook.com [40.107.21.77]) (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 5C71E16412 for ; Tue, 14 Nov 2023 10:23: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="abxAoAXy" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=bEAN6hqdqoEqXDVdzhmh/hyE4R7B92YbDReMN5gBn2Aq8U/f4jUsYrvj4LDGH/oOqMsT3mNVb6dIIaAD+ffOkvZLIxPgOyO44ONfML0fqp9Y60+qwZOpLiTL3rJ5wxRgkWaySi9/2ij4TiV5oesSwdzTlVJRCiPxiVqQWo4THDAxyHOFVIzMEPDP13eOW/UiojO4tSWumRQnsw2/pmw/YGeCUTMeSIMk0OVcyAyYZs4BI6eWylnC+vklQwTz/Co92nERKv789B1CCzdsZkGQ/frZ3xxV2c9u3gu/7Z6gDFbpJRqx5baneBX687PihMF8C3XZzIE4/W46Wpbk43pWXA== 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=ysUkp4mVylQeoPS+00bES1AMp/um1WXzpOnC8sAj910=; b=iWL1ddk+pucCyzpoatdvOmRvXwo33hngI3H1SADhow6PPzu9uIytyzaupfop4wkZlBIWEMSmLu2Y5MTslyrzbemsOE7w3W0DJ/a/c/4Lodo0jNKlPN//MsLkSYwwk2UpeG8YyGYJTT1QBBDfR72oHUxO1Ah9pv9AmATrI+nACdYKWljGjhdrzC0Q8LfqGvtDQj0jy9i1jYPSDwOAxirLo2c5eNlgbWR2Z5syXg4N7TYRcdZZ1gXopOE6bQxGbdGzjCVzNl67Rn8yLZymErifrvhnDaNKzL+YKd2W7nicSzpjNF6R08I14xPYSyxIz+lCS3XFDGIs+zMaNajneICo2g== 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=ysUkp4mVylQeoPS+00bES1AMp/um1WXzpOnC8sAj910=; b=abxAoAXylJAIYya6BomwqvIYf29G/rag1wJmSnKO1dxo8Zafv+WueHWP/9p6cQUQ39laojRxPklzePoZdEbOSkKKHsUfv6M1+TENsjp/skcqE49FGactN74ip5JeDXMxyq8SRlZuaeMBdSpBSruLmg4MgF/h8OYVRpOmdfqgYEz32LGiiczH2Y7g6+1/5NEtwzsiO8bJx9F7CvypfMTQz0or2sYR4RZUim2Hkt/rbKia8jk//xdeErurqiW8EguA1CDnZNSbOWN+4gv/LJP6i6aSUg8V/iLhumU3r51aL/biJqeohZbpIMIvlZ4OZvEJqhc+cmnE3FN+DcBOQv3k2Q== 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 DBBPR04MB7946.eurprd04.prod.outlook.com (2603:10a6:10:1ec::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7002.17; Tue, 14 Nov 2023 10:23:29 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::7102:259:f268:5321]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::7102:259:f268:5321%7]) with mapi id 15.20.7002.014; Tue, 14 Nov 2023 10:23:29 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v3 16/33] selftests: mptcp: simult flows: print colored output Date: Tue, 14 Nov 2023 18:21:46 +0800 Message-Id: X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SG2PR06CA0234.apcprd06.prod.outlook.com (2603:1096:4:ac::18) 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_|DBBPR04MB7946:EE_ X-MS-Office365-Filtering-Correlation-Id: 4e8a049f-bd19-4faf-f28d-08dbe4fbbedb X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 0lpapLRyWZIbdN41AOZlAYKKNeFD3TwWeUjmp/CQCz7tIncjDzJn7aGVJrM3EQqd3h9JHuyDJkkAChlSoI5XxdlOA47OUzbOueH2bowC6hky5RqMmEU+7K8wRj8rSo3TRfkOSaK9ZN8YpzNIQ66PEycoMeI+221zBjB7DDK7lPamlI21R/fqefI8cwKZ4vYAAcuKI69UY8zK/FPPf6shcWWsl1ZWCkjculaRY5WpvEDw+da4VrxXFYtCrEZlNA3G56qHOYcDbYnYleXO0AWqGEndPWFzW/H9YrKUMUxI0Q1IzMWaj5BEONucc6XI1BdPxWqZ3XBVuz43ZyMtqFrXpLKpHvo/O5DxdsNLCpECy+r6ZrcMCXHA/aA39+QI1mo9mbKhGZ/r/Y+6rwpmI2f6KmZ1QFFUFQ+rGrZjx1FOD8qhW06gquLdXzb2j0abBT2L1C4ASA8g1UNKtnpttr2ajV5RgZn0gcb9RLhqDkhlpV7j6BSUicVd4aDx9AI89AjKWJCLJj4V41dieM22v5fYTuA4LfY9fjy+Q7FPpweySssGHLYZZh+IheJd61NcoQIL 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)(396003)(346002)(376002)(366004)(39860400002)(136003)(230922051799003)(451199024)(1800799009)(64100799003)(186009)(2906002)(44832011)(5660300002)(38100700002)(86362001)(41300700001)(2616005)(107886003)(6506007)(6666004)(6512007)(6486002)(478600001)(26005)(8676002)(8936002)(4326008)(83380400001)(66556008)(66476007)(6916009)(316002)(66946007)(36756003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?L6BTkG4OryrXlrI1AkyO7t21/qD9/t/8q+8ho0pVsTjqd5Hv0keO8nuwMkb3?= =?us-ascii?Q?1jpskX2tCWi8ZgvqQdpUnY3q5O9t4GUXJ2J+mH7C+V+tEi/Um02JFCqinDO3?= =?us-ascii?Q?F2jSgRf6y9T56SfI3azGF5bEoVRv+koYglmkeO2AgL5830qDSHrs4jVGnhdU?= =?us-ascii?Q?Ewkk44OEAiYXj4N77hUxKw1wQ9FvDJEjUu7jX1//Qhwmi1OWNsA4EWCA+p6D?= =?us-ascii?Q?Z+zmciR1pUP25aqq8nsuhlzWOfJrmyq+9C2vKrjlFZPYZv5QvvS0/2bqYwAS?= =?us-ascii?Q?kcqsWqZ4FrqVe3hh8FsNwu1q7/t5addUNjipKvfyzkZzhq3Uz1mTWEM2BwT7?= =?us-ascii?Q?NMLd8duTHW5lGh5d0w/4+0Duktowc87kjalBuck6FwYR8U5qjSogHYDBepKU?= =?us-ascii?Q?VS1PlEVlq+/euLyWyqJZ+whqq7WDfcKw4RAYrArdhRIG9pXpKVt9kJk/z2DC?= =?us-ascii?Q?BkVUdVNJYyZ3s9mA8FEJfOyMb5mGnug/ATlcvlxoGuVSfspmJvhsjCZS64Z8?= =?us-ascii?Q?GTAfqz2saWHNtAZFEzqy0PTCEOFGwQhGQ3hQjRyafwvDLNVhuB6st4TX1Xzr?= =?us-ascii?Q?hzkWXoAVWy1mwBzuib+H68aQxvDtriGJIUogy0zQDqdiodVm4DplvE87R8h/?= =?us-ascii?Q?zhrkAP56vgFP8ui02+IfFG3zt4f8Sc/Tx04QE2e/tqlL81zOH/4ANcc5mmZq?= =?us-ascii?Q?Vt2kaaXudJ6hkoTash/9Dd6ZueWPzMHh1UmATtiHKV5yvniekYdXwi/IHgip?= =?us-ascii?Q?+NXxVcoIaHxZiRO0lou+tO4BzM0MfsHSrtZsDemYJEmfvFItp5pDs3860NyE?= =?us-ascii?Q?WbBJwGFaC4O8vUMnYB5xPgfOpn8dtU6vWGn21vj+MHpTcNL6ykmsPZNTdwwG?= =?us-ascii?Q?T872AirMd+qQxg63UJtJG+V7fg4G7UTXqDFJljErYQcQTtISXXwkYn/KAXzl?= =?us-ascii?Q?Ngrj/cv9+3sNZcF6Ni0+PyaK5HHsWYY1WIzkE+Nac27Hkxm4srRRqZN646Za?= =?us-ascii?Q?uS1lrt0AsFlGmbSk4Stn6+VtHZ6mIW1qN34RW8zoAjpCS/LWcguyhTj1X23+?= =?us-ascii?Q?Y96oGnHPt00T1pqDa9M+u8P5y+QGR0HKO8yn9UF4DREHoiy4HecMPhsKKd+Y?= =?us-ascii?Q?tN21yGqZRyZtPGFCjMDyJL7WCBpXS2IoqVj/E9gtk0umD/XqUuEmCwhmYPaN?= =?us-ascii?Q?A1h1ywslm6wYUCXyMATQNTBwQRox5axKnkDHjFS4FLpBugs+w59vh/fFsaUo?= =?us-ascii?Q?EuRrQm9GmzGslBEbZNQSpd83hW9N7SwZ1NlZP5Ws2H+tFWZHaj2XHXw8ThAE?= =?us-ascii?Q?YfykZuXulJUoEMkSb0XFJSaK/AupVcDMwk78tc2lLP7oYj5ooc7JGi6rgebG?= =?us-ascii?Q?wGNWPPN1P1iL5TA8wbSFE4hgkn5ekHS4/xA9Nf/DOAto2lU7hyqPev3Q7oN1?= =?us-ascii?Q?E4hwn4JZ67sMUIN7yXnKfH3r2C1NEP0AinUXMWWB2y1Sm1B+J8Fp3x5t4BDp?= =?us-ascii?Q?xzVJcxxhXxWsJrdAV3KsWOMlTVLiXkdvok7mLyhnDVKTWL3Rd23nzCaMsD2x?= =?us-ascii?Q?TS7m2XjQ6QzffRS5KxWyN+FZ/+xwrPVC5wrPYr/GYxHrxZyPXx2AEoimEnt1?= =?us-ascii?Q?Nw=3D=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4e8a049f-bd19-4faf-f28d-08dbe4fbbedb X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Nov 2023 10:23:29.5004 (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: Bvxlyj8eOKX50JF+YJFj0b0qIx4mP+GDE2pb18OSgZnW6bqyPJNLRnIdWD8b9Tr5kFeDfSDkBK6cBKguhKVk+Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR04MB7946 Content-Type: text/plain; charset="utf-8" Use mptcp_lib_print_ok() and _err() helpers in script simult_flows.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. Signed-off-by: Geliang Tang --- tools/testing/selftests/net/mptcp/simult_flows.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/simult_flows.sh b/tools/test= ing/selftests/net/mptcp/simult_flows.sh index c1a21cd8c076..86f021bccae0 100755 --- a/tools/testing/selftests/net/mptcp/simult_flows.sh +++ b/tools/testing/selftests/net/mptcp/simult_flows.sh @@ -175,12 +175,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" --=20 2.35.3 From nobody Sat May 18 12:05:10 2024 Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2043.outbound.protection.outlook.com [40.107.20.43]) (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 5B8A018C39 for ; Tue, 14 Nov 2023 10:23: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="LtdBtR6m" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=OH/UnipjXYxVyt0BK+5r3aQCApbnRXsJa+uQ4u1/HuadIOUJghWczWhNJBLm8uwiYwsYWCMJPddvVsFWI3IhShqcHvjO8gkbm88VZ39OZXxvTnIXIZVd3/BmeWTmLgER1XtTMXlObmNbvLT2RQPxhR66XWPL+oPeWFWt1BNGKKEC8KcYHEAZTxM7+bb62hL6oo77AaR/F2HU5AS907QAgFmHhqaBh5YgOR1FKmolGbOIyTFkzLKTgRB6mbMiziCXkFKX6zieCocJoBKAi48LHZ/Ll3SwI+O6qLiQWDGmD7nIGZcGoqI3oIC6MXqC9cl7qJrgjNPshrEgAcEHAkH3Cg== 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=1U3CurSV/n5ykq6OhYD6nb8sVbokeful+uBInQxa/ZQ=; b=Le0GZGcjzQwHcysP1IrBxbXnQe+eL73x5O10IpyAkPzf1qjhjyMs4DU0nOSuLfFyCjdJlNk+fEIRUua6C4+Ax0+wzijMM3WHiG8Dv9ZC2jnwVESW5vz09Mov1ghdZDgQ5SEChLto1oeUv9boufWlQw1B+V/1jIaYh5hRpf2/qqXhClGVjWq9NxeOQ42MDkPW7cVF2VG65Isyd60TPWw05X3Z1hs2Ywah0ZxGsQ+9zhWqfQ8y6Yu70fEE/m+bz2TNqz8rmPzm48WwI0ywQqrtvrzUoz1CVnlF6dmYEjYTKzp+97Q1Lh/Kme43JFchAffMNHkBvSpxOq4OlQnDJZ/GpA== 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=1U3CurSV/n5ykq6OhYD6nb8sVbokeful+uBInQxa/ZQ=; b=LtdBtR6mr6huHVp645z8F7jUA85uvYkHEQyU8vAwRRRtsmm/7Ule25cJsX6ENJIiPnRc/+OhLleMGVYFJYPeDul9ZSocpzjaSVyt+CqTZVcWWG/PKgbr32Mvn9sac4eGEF/Otx1b+qTWDUOWBnt7xVhKldtA+P/RMc5RA2ZgAM27CuZMkIek3Zc1KuxKCvSZL02YVST2fPYaZkafw7q5pyolDrW3whQc9MnMqbFm+Bqq/ttG8G8ZT8Ox5OtwygF+FNA8SmHOe97WBN8k3eGJVYA8JunXz6gl4yqFDff4QSNq+sWwsNfx+cK8FZyXqRlv8Jt3B0ARKbc1zaqYRLrGGQ== 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 AM7PR04MB7013.eurprd04.prod.outlook.com (2603:10a6:20b:116::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7002.17; Tue, 14 Nov 2023 10:23: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%7]) with mapi id 15.20.7002.014; Tue, 14 Nov 2023 10:23:36 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v3 17/33] selftests: mptcp: connect: add PORT instead of TEST_COUNT Date: Tue, 14 Nov 2023 18:21:47 +0800 Message-Id: <00ba57c6b464d1807f6189dfe977f73e73752021.1699956980.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SG2PR06CA0252.apcprd06.prod.outlook.com (2603:1096:4:ac::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_|AM7PR04MB7013:EE_ X-MS-Office365-Filtering-Correlation-Id: 0a60175a-2149-410c-97fd-08dbe4fbc2f2 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ZPwjeFxAqy5KJoNRXpUcmYMQJVTka534jqbOBDLQk96xCA+jh+Q5hx8EpIA3Yjt7hCPkzrIHGqTi9iJERuvYccf0X2Boncqo99/BWhnDb4raliAyvpoVFE4BpTpDCA2L2WD5ot3rGKzgj3xprKbueQatZYPfckhaoIqFcO3KqGHa1JngY689HoMyIRgtNYt+zh9uO4jYmK+o3+aOEyELjbNFOOdoecQrdWQkRZz7vt1PJ6EQbV9OAFB2YJppyNCQ3SRp1hOiEWF5QtUUUqpvvxyD838yRr1mTXIui7uvVKnBc2Z0/gu/DReX1zFuOFDDVfzm5LOz93OYXCKVemS2CXgxUMFZwyq/nkJQ5hvYg/X0BR6uwY41MPsP+QIJjDM5mFrPCZBN/iVZEvIMASowfT0ERyiY7EIrJiMHjiF4bymsY+x0wmY1D/6c8IvNWyox5Coki0+EXJo3ghIOMTX1XWHEXCiTtyRHvN1gYG9n0pBeKKY56F/rJzh0PmEVQYOw1gwFuElzThu74H1rqSVloyP423MlIf44QP15CL+lEMK5gpvDp602QvMmwB81R/KS 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)(39860400002)(376002)(366004)(136003)(396003)(346002)(230922051799003)(1800799009)(186009)(451199024)(64100799003)(6666004)(83380400001)(6506007)(38100700002)(8676002)(107886003)(2616005)(6512007)(2906002)(86362001)(41300700001)(5660300002)(36756003)(8936002)(44832011)(66946007)(66556008)(66476007)(4326008)(6916009)(316002)(26005)(6486002)(478600001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?APZpoIFoIJdCdGXSBtyXzhLapUB1DNEMuaYAf+uh/p1de035diuXnWYhWP/I?= =?us-ascii?Q?Qbi225CLlde6NjUB1z0amfxaowhlhsQ7bNc6NG12DFgPe3nSyOWYsywfNq3S?= =?us-ascii?Q?vJtFwm5ZsxDVStyBz3ioAXehPtNh1dQWvbE7EWGcYv0D9D/YxcwPlT2qOrkg?= =?us-ascii?Q?GCSyxW2370yAU2jkzX1hkMGY04zC7GO8UkAdigV68bWoJq/hSVEzLimHVDE3?= =?us-ascii?Q?9qzOIYoYme2CbLZegz1iU484kcIQV9DPKHTMbDTJ3+GrX/DwKLj+0mn0Tgaj?= =?us-ascii?Q?dADObIW2ZRr/12W+LgWbCkggQ2EHOQk0wlHdD9WdbMYksOJ37Uwh83IhcyA7?= =?us-ascii?Q?gtjyTvbPSu8A89FaTBuY75yOXZXJj7WcTlCisrv04eMMiM2JgUMFl+ZLCah7?= =?us-ascii?Q?fJ6mIRfTkuPBkpTnMxP7/GCD7BvVeedeKQQQ2oL+FFeKiLrLVZ6LArzSXWDL?= =?us-ascii?Q?kUddwFzLZ9nKhPaEhpuE0jdKNYLMVsmzZFKdtpbWYITLgyHX8ngbOvkGnFlz?= =?us-ascii?Q?MgPEpKIdxh8rIGpa6lISETKhjGjOLmGO3lz3uxEZr1ScBSxdAvhgy4X5x7B2?= =?us-ascii?Q?auoiUZXloQ33i9nd7DIj1wtc+vAHWPkY2y2GvmPr1T4FL2CZic/yqEHr1Y6x?= =?us-ascii?Q?mnytshkHBwFsVOcYc9ktA6evyCpjk+hDOF+ez2X+79NEDzEhRbIVD/glbEt8?= =?us-ascii?Q?E5xxWQuoom3psK3r6WnsyuNIMoqFVV4Oz/FP/OTZY5TVthDLjNf3eZK64t78?= =?us-ascii?Q?E8MHOGR+cT0ldB1vXTs0ZEyGH3zp90lLQGO5UZ5XuOYvuISJYbvVUSI8kedZ?= =?us-ascii?Q?dlGf4j9Seh9lAPhiPZTnpQ8Vbxvewrm+QVMLmewlLZEorIlTqr8PKNDeoP3L?= =?us-ascii?Q?mu5BXaNd7r1oxpllEEF2YpAEQZiTczj8kXxAUvcHBIufvB1IUybnaNSUJABQ?= =?us-ascii?Q?1x3KijOyJ/1sEcks9EpYd2rZokHw+QhtHKOpEMLLcah8ztGtmBBkFzkhFfqp?= =?us-ascii?Q?PSw4AiPg09azCvptWehG3mv9s7HaOFZhW96tJOgumLXinFbZibtMZsIkEnAC?= =?us-ascii?Q?npna388Yk/gApp007kMbRjm65dG5B7put5LegqKhZ3QA+mA7UkKcEY+Ia1xm?= =?us-ascii?Q?f/xFaLT66xLbuM7uQ8djmDrepjZwUsmQYvLCrQLI1oX5Tf8TBv3BTDkQIhQb?= =?us-ascii?Q?XjpEzkw/xuW1DbV0BSNTZUCIHdS2pVk8x234GKTAVVXvfnZLt5JGGyy8Zxno?= =?us-ascii?Q?5CcNEIuE+o9Rf+DlXEB0KeLpNXmGJWhZ6XgscZI5aUi9aUvDLl2R7Frp+a2J?= =?us-ascii?Q?SBgtC31++3fSbP4tbaPpToPcxk4AHWEyzo2J0riuUnEoUYTYpkxcd23Z7MXS?= =?us-ascii?Q?aY2sucowfxO/d+JjFewLk2PpLoFF/hvoiLhz2Yk5dY0nLbTxG6GzQQWS5B1H?= =?us-ascii?Q?lEjIb2YwgixV8NctMIew9rBGzKwr2OGCI2ZMDrxtQQDY5W8nOgGe+qj6eiq3?= =?us-ascii?Q?Q3jSgp9v4A7nQgcn6bAX+GdNOnpM37rTOJVjdML58t5IcHsUHwHALvBaqW9W?= =?us-ascii?Q?6Spm5k7Zs4DoSvo3FAhPAgr7HeQaA8z6n5E+yNWKNlRZrn2FWmRyX5eQzvk1?= =?us-ascii?Q?VA=3D=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0a60175a-2149-410c-97fd-08dbe4fbc2f2 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Nov 2023 10:23:36.3347 (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: B3766LgR+jXBBYwzW3Bp2trCRA0v6822Oq5vde3GO7/NLfJT/smPRHlMYlkQ420yGnk7Xd5WQmOMOSH4/LCeYA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM7PR04MB7013 Content-Type: text/plain; charset="utf-8" This patch adds a new counter 'PORT' instead of TEST_COUNT to increase port numbers in mptcp_connect.sh. This can avoid outputting discontinuous test counters. Signed-off-by: Geliang Tang --- tools/testing/selftests/net/mptcp/mptcp_connect.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_connect.sh b/tools/tes= ting/selftests/net/mptcp/mptcp_connect.sh index 4041414c8804..0a6d40c3aa85 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_connect.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_connect.sh @@ -28,6 +28,7 @@ do_tcp=3D0 checksum=3Dfalse filesize=3D0 connect_per_transfer=3D1 +PORT=3D0 =20 if [ $tc_loss -eq 100 ];then tc_loss=3D1% @@ -308,8 +309,9 @@ do_transfer() local extra_args=3D"$7" =20 local port - port=3D$((10000+$TEST_COUNT)) + port=3D$((10000+$PORT)) TEST_COUNT=3D$((TEST_COUNT+1)) + PORT=3D$((PORT+1)) =20 if [ "$rcvbuf" -gt 0 ]; then extra_args=3D"$extra_args -R $rcvbuf" @@ -691,7 +693,7 @@ EOF =20 mptcp_lib_print_info "INFO: test $msg" =20 - TEST_COUNT=3D10000 + PORT=3D10000 local extra_args=3D"-o TRANSPARENT" do_transfer ${listener_ns} ${connector_ns} MPTCP MPTCP \ ${connect_addr} ${local_addr} "${extra_args}" --=20 2.35.3 From nobody Sat May 18 12:05:10 2024 Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04on2084.outbound.protection.outlook.com [40.107.7.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 ED04E18C34 for ; Tue, 14 Nov 2023 10:23:46 +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="33Ay3paC" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=i236/THQ3qJi6zVf5RmfSdIIUZf8FDAm8FdRaRCSz1FTn49UG3eD9Xmg87l3qcN/j1llJRaN06UhwaRGGF5a/SRlZ37Qj55OUzlF00XhevL/jNCj1ByOYlitfOxwB/ZObZOOgBdZwkzxO32ASH7aqlHB5B2l5gwjnC95vS2HcYWAq0oz2phFZiiiKOJHPl/g+askCfXNMPMSS1IiLZSsclgs/dhnTCzk15hN2fWSadaZ+7f/dD89EBW0GRI2wfiUz9okGdlMQ9OW4USg5MLE2oeykQPKYCb9KLJ9EOx12JKXf71aBiuczd2ftsqE3tbvGwaXsqUZEczLzpSF0b/CDQ== 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=TPgKtBgb8R+Eodzpz0NAQe7lMk5DTfdsZaxJOTktBeI=; b=Qj1PRCPRtqq8BjOb85Ek8Fo4rly7BJ1uSMmFqVI9A5dlC7KEvKwQQre7AxTlG8LnQyJzIxIGpjmcaeDNbME3lfrxy7CItxt9H21z0JGFVPP5GBqQ6lLLMSN+WUVe29Gz30cc3gnAhhi2fijAOoSd90ByNQFvYUU6SvMbZuj50ox2vNChsM+mPD7TYxbedB2sEe49TTWyGqH2WXhN8qn2XYW4zN0UQpvnS8yy3YBjQeuxSdqEbDuT57gK3vhOSDh8xEmS2L9Xf2YefkeOu4CSzdCpc8P+ze8FBitRAciApUMpPry0KAA3s4Q/JKdQaiobZL2Pv1D3lXh1tNdOkvBxjA== 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=TPgKtBgb8R+Eodzpz0NAQe7lMk5DTfdsZaxJOTktBeI=; b=33Ay3paCbITFDZlexRRYudxX++OVLGOeak+nlO4gfGHFBysEMhJwlleLwG6dhrPISxlFH+ZbtpJYNZ/XPXjPN472u0To8a9FQBK2kowgcSTCfldHMGcCxXo2Ea2UfqaJeE94Yj2OWA4owtoUGeUegQLd8PDYbwnylpttlM7xOmMO9kp/79ubYbv4RyJx2stQpPWxfIkfPDK49M6aPVnYAWYxMEFClJFHWMom06FZjzVB12RJP0ayoc2K+lUgd7WfmQZp6mYe8q5LW5r4PEXWejf8Y8dx0Xv7eCPnyiUq2si6Pw8h8HiUN14RMFuuc8suo/FyhGmt1MSfY+T6DgG22A== 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 AM7PR04MB7013.eurprd04.prod.outlook.com (2603:10a6:20b:116::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7002.17; Tue, 14 Nov 2023 10:23:43 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::7102:259:f268:5321]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::7102:259:f268:5321%7]) with mapi id 15.20.7002.014; Tue, 14 Nov 2023 10:23:43 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v3 18/33] selftests: mptcp: connect: print out test counter Date: Tue, 14 Nov 2023 18:21:48 +0800 Message-Id: X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TYAPR01CA0164.jpnprd01.prod.outlook.com (2603:1096:404:7e::32) 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_|AM7PR04MB7013:EE_ X-MS-Office365-Filtering-Correlation-Id: 556a4673-c2c2-43b9-9c24-08dbe4fbc749 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: OiS4h97U4pYIjgA4o/9EWJs+F2VWtjARe21qxu2M78b71MQMpxkaQFjDWasg4/MJZi6eplU5lWeq5tv5f1bSLVfVl2od6tqYLUgUi41v9FGFUJ4WgtvEin4RMl/ELJ6w+SIPnvlzQrYYxSbqYJb7D3snRD6gmIRagd4JJt9UoxR43u20y4d9VnJEtOJbrkDJiloe8EPlvFv1WsMDxflJLjVM3hZHLCIZaFPcL6URqQrBdUUhnsepyDKOiq16SZKXo0ivmzopw7fCNFqbYW1LPZPME9teFVEUL1phjc3eWPD4ySqFIXbrB4oA4mTOXrpOoSA2A6gIOimQ0P0rKUqM3LDSIjbjncwPS/flRz553vP3kJVpFXaPEb2RqCdXOFSrbNRZsJYYXw2NSnck6A+QNFgaGIWw5aY3abrjKQqExM6fXJOCvoU+bEqkbEcLGrYa81MhyBYElE51AylQZTbooBhIopElQkk+AhivRbjlc+3M+98M4WOjNhUMU6keetMBv9SAwFm3ovd9cfRi2Fd+Hy+c+71bgkoRUm54AwldKQp/VFjI6HD2e1OIYO+l3i9b 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)(39860400002)(376002)(366004)(136003)(396003)(346002)(230922051799003)(1800799009)(186009)(451199024)(64100799003)(83380400001)(6506007)(38100700002)(8676002)(107886003)(2616005)(6512007)(2906002)(86362001)(41300700001)(5660300002)(36756003)(8936002)(44832011)(66946007)(66556008)(66476007)(4326008)(6916009)(316002)(26005)(6486002)(478600001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?CxqHEbWZhHoiE7AkPN2o9sfcPXsdlUfBgEgFIgNAfnLnIivXYeaBlWpUyoU4?= =?us-ascii?Q?LbTYx8dUQEMrvVRUCmTd1kjbM6WDqmG/2rBrIN17gnrtvAchP9ZdtZYdLdw9?= =?us-ascii?Q?P30iAnGAL5ArcWWgc8hbRh3NDPo/SLchvu+sOyQuL/tlRebdP7gGvoJtWpmm?= =?us-ascii?Q?5/RvNsMOk85soiWzTa7aIL6dZR2FE1kbY4cb8cJXRe7DEWeX3Pad+mgGRodn?= =?us-ascii?Q?+4LxHREqG/NC0fJ4mpO/zldJONLTeRuGZrIQDlf+a/2vhIbRzFULlffMtRYi?= =?us-ascii?Q?B9xhGZR8SKuQMVmb1hLcIBXJtol09CMw4N/KZnKlUJ/dw/UHEyBRRe7t+Ke3?= =?us-ascii?Q?b3S/Ka9Wp9TCVDHGkkE/tk4SOZ88NTmMbSbu99xomryUMAcWx37Dpp1m7Rn+?= =?us-ascii?Q?kw1LFYvFjjNQJ6ctkyWL5L+Gi2aM0/cBqJW/e52NlydQsjAfC4AU+ZnHNV11?= =?us-ascii?Q?wNGPsCTgQKLbIHI4KZsNGabJqbXH3m20f5WbdC7z0NI7GzpIp8LWjCQFwiMx?= =?us-ascii?Q?Z9F+t/kCHfar6itpcuh5NzYHbPs9+P7tcaMysZvNH7m3g+r4/AO+5AnLqrLu?= =?us-ascii?Q?hu62VKpOK9Mm9QrgImmWkJUx7y7woD3OMkB0v4ZaoldYiUiRXy8EjC5goZN6?= =?us-ascii?Q?O6v240uTxIRyu6JWbEHJzaOD8zn25CzPdQOyl5tmVRojhNXpIy9qxuw8KTk1?= =?us-ascii?Q?LTYdQUsdWUKl8bR7Chi8TfMvvD32gZ0h+FlveCfmE1MEYRZcuDrBEZikxD5v?= =?us-ascii?Q?RUzqTFblxETKOpq3BCE18YPmG3q9OMFoqd7bnbqjx18OW6jJ2EocSGLYhdnm?= =?us-ascii?Q?Il8cVrtrowfMwcZ47eFzVFsj7QiXpOPmKrlt/BDkY7G+Di9Qsc480ullqoVG?= =?us-ascii?Q?lSI5el96pOiLqiIdJuC7AoJiOLK3LtTgeG/R/DuJn54BqeZR9/TS/l8wcWGc?= =?us-ascii?Q?3eWnCEjWib/7qeje/ftyMNhl4zSe4Hwfa5JNE0p/F20/AmKpp9QOZKMnjq08?= =?us-ascii?Q?cv3jfO1irc98tQksJ8R6gtR49NRzh4DcUd7pp321HeFcCCrrbGn27GSXbEtZ?= =?us-ascii?Q?At+Tj7qxmXgQ/B2+LuKqHOXgZV+ZVeiLyHUCHML+BvSvYnn1sBgmnTKx3+8y?= =?us-ascii?Q?FQAh+DmiF8jPpAPltRHu+7sOvgc4ZV5oxBPhbpjlF+TgiM2BFTG6ysLSbQZ2?= =?us-ascii?Q?1LbH+YThMcR6LcxTx4vZonKRD0RLLszcM2cVvs4NKmWzueAc1aohpfp6N0L+?= =?us-ascii?Q?kMo+RuSa6JgmqPyRg8DnZ3kexocWgmT4kXfg3igj4rN3eHZx0QHGNpCl0eQd?= =?us-ascii?Q?xEXiUMRKtkdWMIPcFnmYq5/eXaWWwW2YPOZCxXRp0IKRYogq5FIfByzmm9a7?= =?us-ascii?Q?113qgMJcSN7perlgVfZQfwWwJAU3jgtNUQwvv0z0j6nKa0cfmC4wGjnfJKaO?= =?us-ascii?Q?VqA+k6TTXBBDdw3KMXGiSnOQqnh3aEM5Y4AE+5kkJfuWUcs6IVBhRdtVpH6M?= =?us-ascii?Q?DJvweYL/2U6Bcsd71eqyV/RRFkTUTQkxfyXpA0rx1dm1/j0+UwIyOU1trUwZ?= =?us-ascii?Q?fcKfePka5YJzrxRyCiDFwsPbh618DDpGmnZRv1Dn1nPIiXSXX8fFOc1t+qZC?= =?us-ascii?Q?uA=3D=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 556a4673-c2c2-43b9-9c24-08dbe4fbc749 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Nov 2023 10:23:43.8498 (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: /yZTiI4hdz27cxm/wOO2triUAQ7+kQ+wlCSrhu9sdQtc/nGdqndkX7CGUlnd/0rtBOh57ZcUZ0/q2ccINq25mw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM7PR04MB7013 Content-Type: text/plain; charset="utf-8" This patch prints out TEST_COUNT for every tests in script mptcp_connect.sh. The output looks like: 01 New MPTCP socket can be blocked via sysctl [ OK ] INFO: validating network environment with pings 02 INFO: Using loss of 0.90% delay 30 ms on ns3eth4 03 ns1 MPTCP -> ns1 (10.0.1.1:10000 ) MPTCP (duration 116ms) [ OK ] 04 ns1 MPTCP -> ns1 (10.0.1.1:10001 ) TCP (duration 33ms) [ OK ] 05 ns1 TCP -> ns1 (10.0.1.1:10002 ) MPTCP (duration 25ms) [ OK ] 06 ns1 MPTCP -> ns1 (dead:beef:1::1:10003) MPTCP (duration 128ms) [ OK ] 07 ns1 MPTCP -> ns1 (dead:beef:1::1:10004) TCP (duration 31ms) [ OK ] Having test counters helps to quickly identify issues when looking at a long list of output logs and results. Signed-off-by: Geliang Tang --- .../selftests/net/mptcp/mptcp_connect.sh | 21 ++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_connect.sh b/tools/tes= ting/selftests/net/mptcp/mptcp_connect.sh index 0a6d40c3aa85..7442bb2a8562 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_connect.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_connect.sh @@ -267,7 +267,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 @@ -337,7 +338,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 @@ -641,7 +643,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 @@ -658,7 +661,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 @@ -675,7 +679,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 @@ -685,7 +690,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 @@ -842,7 +848,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)) --=20 2.35.3 From nobody Sat May 18 12:05:10 2024 Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2044.outbound.protection.outlook.com [40.107.20.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 6755E18E30 for ; Tue, 14 Nov 2023 10:23:53 +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="IrJpfnZI" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=asnBRoNNQndpe2Wc5hMEGLbJtOLHk3z7z3/52TdOCmrrF1XKJ2L+BQvmhdwaRIYAA071nuJgDTuZhC1NdZMicKp8CFGDDfNA7SewxoViehGecRdb/9ISoEOP1qfeyQ4aicWad0VcEv90kmau5mc+Ks50lhn+fFhiZhPk3cQe3xIkFZL20L+mXVpvBpM8xEJnO6l9fn1xOeeOix8p3FljUUOd7RJRsBSPG8kO/1xo7tXUos0c45DyJkHqb0aFqCQATyZ8Prs/GuMp3q0hPquAI8hNoOwgb0idJlvEUXhe4LQT5JzsN6FZEpO03NqoUobvvcea5vA6BtjqbI5II6isnA== 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=pstlKgHJVkC1IFYS0OtawCtL3Nx6gmiEQybXiFmd+Co=; b=amNq7ejiKAljddidHBJNMyK5FCFQSMQncqROSI5jckyY9xPPfRpHXZGAD92CY5GhaqV09ITPZrMyH27sJlaHWVUHHtx91h9vho5Ieuv14CUwVwMfs6hN4AiMk6c0XgO9e6uRTVbrZZiXrNGcWd+MQ0ynTyB/672rJtNNh6s7Vn50lzW/1yEPsyk9YCH0NErtftDM+hGJfUMUfwgyqlTlAoNEE0ZsMbOIBd406s2XNfnK3ru9nZpNK7VE+WipUajKrCXyWRSo/ItKGoQcxLzh90ANupQVIaLAYfTti7FvDKtIkKTU+4XlDNaQoOSpiSpbUWGheIUW2s1a9Vb/mlJVGQ== 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=pstlKgHJVkC1IFYS0OtawCtL3Nx6gmiEQybXiFmd+Co=; b=IrJpfnZIuGclST7NFWRQvWM72P6S11a2NAFTohW/iO0wH3dWdH0QcnemYR1F4pk75wfVPPPelzBRehw/ltSYXbQGNtcF67hZ83p+lVAaj6NpRmBliPk9f9lmcqVDcBQpbGydRTzG4Vmy6bB1nLRzvDT3naVALJHKFQdeUA8OgXV1hfMU+zah1hhNLyeMK0po/2pyXMAmZlkBcHUcMxlnoGl164caLe12TDITXSXOpLyD+4HMH9Rj3BD67Y93G+GdY2oCAWUj17uvr4IX2GkYV4bbl7h+ps08/azclnJdyoH4D/51moi+cd+s823L8u8dzPYn7tUC9j7n5PqAs7rCUQ== 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 AM7PR04MB7013.eurprd04.prod.outlook.com (2603:10a6:20b:116::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7002.17; Tue, 14 Nov 2023 10:23:51 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::7102:259:f268:5321]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::7102:259:f268:5321%7]) with mapi id 15.20.7002.014; Tue, 14 Nov 2023 10:23:51 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v3 19/33] selftests: mptcp: rename test_cnt to TEST_COUNT Date: Tue, 14 Nov 2023 18:21:49 +0800 Message-Id: X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TYAPR01CA0149.jpnprd01.prod.outlook.com (2603:1096:404:7e::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_|AM7PR04MB7013:EE_ X-MS-Office365-Filtering-Correlation-Id: 3aa39772-afa5-4601-4f80-08dbe4fbcbd0 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ycWwTyurY6s2CpVhCwTBaTdNxy3QvetDJ9bNa8vpteScim3iKd1cqggsZmLtazb7IkZx4GAQjzCrOXWynafkVUxJDGK9aYXmRVdE0Fyf31yZkUj9E3qBUtAnKq9INNrN2Hz3S9e2WTbp5eScGPYxonmhFKVOfs6y28+MQPD7B96bW5lUCmCGOzK9oIJLz52pVTFV+E+N3GKYy35gFMxHXY++NgEwephYdKnv6HyYCBG5BDTpVanxDyfr5flB25yV1Uh2AfWmSdOikFNawiwl2eA6lQX69jTTjl8GuFjI9+/EzYiElihAOMsXi725w99TU3Fa5W9edpNISGAuLb+aqFfA0B0mFQl2ZCS9B2oYJcRYSYRjFfx5lWSHrRDFAWzyAlBeyNorbupf0yItZlBBmaS0oSR4DRF+4iEumwIzLPxKgauAG46qn9FAxtAN7Nr9Wmr6/UzcaEGpaaZvMId8qVr2Z9npZmW0XG1jzusAo4Deov0x4rK274kRthub06mXek03aUIwoKKMs7WP/AHqBrn2Wf8QMsKUDD4Zx6dCX/llH3tp18sjpWpRxLpdEZrC 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)(39860400002)(376002)(366004)(136003)(396003)(346002)(230922051799003)(1800799009)(186009)(451199024)(64100799003)(83380400001)(6506007)(38100700002)(8676002)(107886003)(2616005)(6512007)(2906002)(86362001)(41300700001)(5660300002)(36756003)(8936002)(44832011)(66946007)(66556008)(66476007)(4326008)(6916009)(316002)(26005)(6486002)(478600001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?iNZLhCmy6rquP91cahiW8V8gqJ82nNjPsOfegfup/IQjquoEbpFg6KhZMCza?= =?us-ascii?Q?qhXOWfuo3f2eKk291DA6I+vKOdH9SK3hSCzwcf9eXCpNZLQEPRk/FMO9b/yS?= =?us-ascii?Q?IiAZZWrphQFUv3kl63QbSjKvAt/cCOJBpJPSuIM8I8x9yvAI1F8c7unI53wT?= =?us-ascii?Q?mg8bK/krdJAO2deX1UWP5J5A8RApjOQWkJI+XDZqltQGGYbSamikCMIZH16X?= =?us-ascii?Q?rzvmMXY0ciSBaKtyTbHNBSaZW+1jzrwluQNkbL8gzp2NbU7lOsrYG3Ioim8N?= =?us-ascii?Q?+gjw8dlZpWx+uuIrvpDB8hSvFM7wPgOGeu5M9ZzMFHZjXn1NdB4iGHiRB7bg?= =?us-ascii?Q?X99LXzrEEVgLqbcc/Tcl1siGbzhQsHVsyladj3tv99uN89esOuD2oT9gtIcu?= =?us-ascii?Q?g9VPpirnszC/SlY0oi8zert2bzOntVtpEh2mbzu4yBvRogUnt9J69U0nLtKF?= =?us-ascii?Q?QDLNtRc4JI0stIPzeTftSlqrXV6UNNQXm7vZC+X8ew98epyc4GLCdJvDnjWh?= =?us-ascii?Q?lkcvzUny3UbuuzaMHA7e2T98KahhwPRUU1lGA4fhqckXSP0bJF9GsoJoYpOM?= =?us-ascii?Q?oDi4X5OWu0wd4CWFmlY7EmL7p8KC+B1b33jKmYfdwAAW01Uw90nkhS/EHazp?= =?us-ascii?Q?xbFiQ0Clsm9Cmf849Wp/+uYB5gdxLJwkqHsxxa75vCDIfrk1kgKNeUl8POop?= =?us-ascii?Q?b24/JkgV6fvADAIYS1oh8pzXeH5ohE7nrGWD69HUb5cwsfD5G0io3FJzA7qR?= =?us-ascii?Q?K/YLm9lG7ETQV13QYY1OtbkZZT3Ih2hR0EcWS+lq5DxpLyha9j+1y+nlbT6S?= =?us-ascii?Q?gkJXfCHcDSONz0MwtVHmcxko1SdufEH3Pu0ii/RCYfdw0N7hEcSXrODhvO5s?= =?us-ascii?Q?CnGc7bTjKX8H4rqTNLddCLM8t3bzq26o3Q063iN7qDSvY50s12akSC9L11BS?= =?us-ascii?Q?ROjNnxQQ0/dFhV1hp5j7mrEn2hUGOhFC7ceQPYsoJngSULSS2uqGajewTshf?= =?us-ascii?Q?yf2k0SxjNhouoADSpwtTqtb8MZN4PK1cfvkm2jvfGiHTg675fEQdxevWuVVn?= =?us-ascii?Q?nzGt8Ve37wL+CsN5nG3mfS2SB9qkDTR5BF+8jUV76AQbvIGGAN0yUmdOkh01?= =?us-ascii?Q?MIY1D5PCrMqKhJQMlAzJPSPdln93KnlUqhbP7a1gQ2NKuonI7hLSHck9Qanc?= =?us-ascii?Q?GcimJUcCwfnwJOpy7dGbL98oQnits+Yu4fF6Ms698MfiOtmd/x20E3X/Dwgd?= =?us-ascii?Q?5YSbfOI/lGZNnrH+NXXDMPQVGRxCfR4TMnxrKGU7XIU0oepRYlBGzMaLamFm?= =?us-ascii?Q?hVxTTGt9CnoLrPMRhaTlW8VBEsEzg0WRjy4OhVoTM8G/nORpj/tvhC4H3LnH?= =?us-ascii?Q?fAEWmiKhazywboGVRJxk9Mwy2pcNAi8U/TOpODjX+GEcpgPId5y/FPx/hQWO?= =?us-ascii?Q?RTg/h1BXtKYc/sGmXrvHTSMac6C/h39nzhVxL9zDijqKRtwc2/IlRkoI16GD?= =?us-ascii?Q?gxQaUwozLAhDVAWbwQAbAn59uaNhtZTmUkmY7q+pJLHFCxp+U5qGFvTkLe0X?= =?us-ascii?Q?RmOuKipPo4GfodRUw9iYEVSVSnJj4RSQ55bAE9UCiZ5oH4qMmyEUr7N6oFlI?= =?us-ascii?Q?Lg=3D=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3aa39772-afa5-4601-4f80-08dbe4fbcbd0 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Nov 2023 10:23:51.1794 (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: UTl0ESJscSaPM4d7VIYWr8+t60VaL2oedd3coj588XtXKxP5M03Uzdb8zrhdMDyg8IxIXL7uidGC6blYRM6bFg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM7PR04MB7013 Content-Type: text/plain; charset="utf-8" Most scripts use variable TEST_COUNT, but test_cnt are used in diag.sh and simult_flows.sh. To maintain consistency with other scripts, this patch renames them as TEST_COUNT: test_cnt -> TEST_COUNT in diag.sh, simult_flows.sh Signed-off-by: Geliang Tang --- tools/testing/selftests/net/mptcp/diag.sh | 12 ++++++------ tools/testing/selftests/net/mptcp/simult_flows.sh | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/diag.sh b/tools/testing/self= tests/net/mptcp/diag.sh index 7cf1f602bf48..541a9d2d128c 100755 --- a/tools/testing/selftests/net/mptcp/diag.sh +++ b/tools/testing/selftests/net/mptcp/diag.sh @@ -5,7 +5,7 @@ =20 mptcp_lib_ns_init ksft_skip=3D4 -test_cnt=3D1 +TEST_COUNT=3D1 timeout_poll=3D100 timeout_test=3D$((timeout_poll * 2 + 1)) =20 @@ -67,13 +67,13 @@ __chk_nr() else mptcp_lib_print_err "[ FAIL ] expected $expected found $nr" mptcp_lib_result_fail "${msg}" - ret=3D$test_cnt + ret=3D$TEST_COUNT fi else mptcp_lib_print_ok "[ OK ]" mptcp_lib_result_pass "${msg}" fi - test_cnt=3D$((test_cnt+1)) + TEST_COUNT=3D$((TEST_COUNT+1)) } =20 __chk_msk_nr() @@ -113,16 +113,16 @@ wait_msk_nr() if [ $i -ge $timeout ]; then mptcp_lib_print_err "[ 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 mptcp_lib_print_err "[ FAIL ] expected $expected found $nr" mptcp_lib_result_fail "${msg} # unexpected result" - ret=3D$test_cnt + ret=3D$TEST_COUNT else mptcp_lib_print_ok "[ OK ]" mptcp_lib_result_pass "${msg}" fi - test_cnt=3D$((test_cnt+1)) + TEST_COUNT=3D$((TEST_COUNT+1)) } =20 chk_msk_fallback_nr() diff --git a/tools/testing/selftests/net/mptcp/simult_flows.sh b/tools/test= ing/selftests/net/mptcp/simult_flows.sh index 86f021bccae0..6a4568d8f596 100755 --- a/tools/testing/selftests/net/mptcp/simult_flows.sh +++ b/tools/testing/selftests/net/mptcp/simult_flows.sh @@ -8,7 +8,7 @@ capture=3Dfalse ksft_skip=3D4 timeout_poll=3D30 timeout_test=3D$((timeout_poll * 2 + 1)) -test_cnt=3D1 +TEST_COUNT=3D1 bail=3D0 slack=3D50 =20 @@ -115,8 +115,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" --=20 2.35.3 From nobody Sat May 18 12:05:10 2024 Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2044.outbound.protection.outlook.com [40.107.20.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 6DC0B18C1E for ; Tue, 14 Nov 2023 10:24:00 +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="azU9mMH3" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=SPpoPxrCyVbcerXcrtPseax80vAbczD15UBt3MEzXOiKcDOKYPweV1pzX416rEnBOc3PyR79OGkvM7DC352rW+/4r3UQvW8ncLZN0afmr6pf5eiArgvyai6SxWvPcSnRInd0ml2GR9jVRriuha3VVM+ezG2e119V/F/ZRxFiype6ujStceX5z4QUPM1lUV5/m5cuBHFv/OoG5vlxIneKe7+rQnAsvsyA8oh71Qed7tjJhBZr4x1XrGKo1yDWInmTVu8YLvQF5E1405edhlOm3oCoD+oMumMTu9q6jptLyNcYoK8dJMFdipo4tLk9GCZpmePKX+7InC1Om8LEfNASgw== 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=ylyB2i6xIwqVSug7eHgYL6mnnTQJMkmRI7REsg7punY=; b=ljFRM7hB4MBIF9Beh1T0MK+XNPnEpZEEKlFGyc5C2RyK+Sk+GSso/0ei81ckiQPGTCGnQFccpMqCXbmK4bPsmUgTot+jAwNl083ssnQBC/PsQmRHpma0+NEMcfA484EYlBmFLnbp+vVaRJNIFaHcH7Yw3nkJU/zmxp5rxquULmznSD88tx1Qxz95NzPC+iQkR3QpMxzkOSP9mfycpcF9+Ou1ZAkJKKfK5pVUjhU4EY3HoESl4RsdPiuvQ08hew94BHj0ng62jsrIN0SRNGHKxiEbc8lOQ/qYTOB3hAMyQ0Hz+l+cNqZ17asua3xa6eJV0DYzTGsg9Bt+GBrEG/kDVw== 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=ylyB2i6xIwqVSug7eHgYL6mnnTQJMkmRI7REsg7punY=; b=azU9mMH3cjfTHWJz7DdGZYvR5DkKWwQ0mEnHp/bLrJYS1BlkAuTw15EoJ77DaNgYHrPQxT+1WCTtutcb/qsq/5iNa94c82DwNVYDMNL/k/qYEuhiZFzId2gkmuuRP9mgERlDHjpXn7bGS4JUxXtjwVrl+KTT0lBpQJFRDu/8V7yI0AFe6DjeOMfErJVR22P7hEMuXH4qYNS2xdIj68uZRcoqj93PwMcfGmCruKK/mA6/z8dMt6EBziqavkFR8gJ3oLRkB0aRzEwuSoyHbGXP0QgMln7G6KV7dpI4Y7sMYmLy+3VKuKU7Sz3Y4CTF/qcHUiL3LbzapGXL7h7FN0W5Lg== 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 AM7PR04MB7013.eurprd04.prod.outlook.com (2603:10a6:20b:116::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7002.17; Tue, 14 Nov 2023 10:23:58 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::7102:259:f268:5321]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::7102:259:f268:5321%7]) with mapi id 15.20.7002.014; Tue, 14 Nov 2023 10:23:58 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v3 20/33] selftests: mptcp: diag: print out test counter Date: Tue, 14 Nov 2023 18:21:50 +0800 Message-Id: X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TYAPR01CA0154.jpnprd01.prod.outlook.com (2603:1096:404:7e::22) 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_|AM7PR04MB7013:EE_ X-MS-Office365-Filtering-Correlation-Id: b5f220e7-ac35-44d4-1a42-08dbe4fbd00d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: b4hswU4x0nZaAhHucw5F+EwomD6vCJsyJ+c2uy+T5Aqk72rmOtIgPWdR+A8Km74EGEOsQ4ppFpmCpOURFphjlr22YQEbcCVM+94QYvJuwOm/6VsQAak/IpbP29cS3yMVQQW/attOQlU9nL+YsH+AItQ3yb67SdbTHtKVI8o84+1z6cWRduCRzbQHQUWIPLv/3ZxbpIv9VrI10oWKlQtCmnKNlGInhRmiTPt6yVpWxKcaqTVugYFeM+w2Orl7quA+rHbsiIPIAHU7iLOQ6D+C0jVJvPpFO3xHINbPP7mLK8mieeZSo47JQO+EnGfmnItxW0yi6TNLP+DYA5jWRR0rRCGfXXY2ePzQbI2LMvEwFp6wOSKs8VSRbphlGEvuhIw7bCsvxLc3QvAOv/cyVkoyRl/SKGiKdjisbbZ6GREEIhMR02xZ72n39J3VhtsiOmfLfB2gqzYhIKmh/nX+V1e0KYenyoqU4pHPYOKhZdtzUlc0A1eAr0T3YuM5o3OHo0KR4MEzmRd4TRe2nFa0OSYNICP4c1uBPTiawPy7v0CeLPEk4lFdazuuuYsucV2Q6rOr 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)(39860400002)(376002)(366004)(136003)(396003)(346002)(230922051799003)(1800799009)(186009)(451199024)(64100799003)(6666004)(83380400001)(6506007)(38100700002)(8676002)(107886003)(2616005)(6512007)(2906002)(86362001)(41300700001)(5660300002)(36756003)(8936002)(44832011)(66946007)(66556008)(66476007)(4326008)(6916009)(316002)(26005)(6486002)(478600001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?D/V34SPGGVp56ENH+QuVT5w846YGzFCJLqolV+Iu0qXNwdAmcwvxYmuFmn23?= =?us-ascii?Q?ozQ2IeO2H6xTPcDQlVfXT4tzzPvp9rWr3z3xM+YtnjuQ57o6SRU/64It5RTb?= =?us-ascii?Q?dvd1dJTpcZziOP3FEFhuxmbJ5HeNxx/0ifrHlpXvkLxRzVrlAjAR10oxvZN5?= =?us-ascii?Q?67lsRIwRxN5z0iq3q/7tTfVrYBQpqQNd46Jyj6LLGuqKdihn4LSOq45XILRV?= =?us-ascii?Q?VUCkyQziWYSdJrwt5QU/yw0u1A92NhbUkqBbAbp8j8B2mZy6InGO1BdWsEOf?= =?us-ascii?Q?S/bOsQNG37rD35YQC56UOvW6EO02ykptCzuKQNGLsKmQjxySz9dGll+QAqEl?= =?us-ascii?Q?xTMvT3E+3ckdy+HomMPsRbmERMf3tVsy32f734kKzcX1qvj1dEE5mvDaW0ZE?= =?us-ascii?Q?551MLcI8wwSKQ+CmxasU99a1CMhumtMOZj1h24iwOjuTI+9xecJOC077Jt8n?= =?us-ascii?Q?ohZ8RNSLnhARLnxS2jBWXmlsWSgrfwGax3zq7gwcrQ5QjqrbFtFl9svIoX/P?= =?us-ascii?Q?SJx89OwCouVcshmawyQNBNnXM4GFdAIofC0tGPbCDTCK9OWLgPx4ZL2ufSww?= =?us-ascii?Q?LOK0DAPO+bXhmaBMoSdrCT5M8COH8j9dXdaPP1+19WDOlfbe+TDM5MBW8HkO?= =?us-ascii?Q?61/XnO6NNZ44j6Bt1DWvtTGDv05U+MhxO8Epg2ZUWkzfO6IlSaBkYUmk/xpd?= =?us-ascii?Q?XwiUCI2oi62pbHOAsx5MG2PKieOYqxKeqH3K9vnx3IRsOfyay4Qv4G2k8od9?= =?us-ascii?Q?23V7b7xJMX9EXv0ytCMLxAqXIqWTWKzUGXq+ZVH6HO7e2orcch/Sj4aGP/03?= =?us-ascii?Q?7Obl9kMfe3ulG3wWd2kSO/uZClcbP4/O6yBlYX/oyjXXnB8HAEdEWIzi8oYi?= =?us-ascii?Q?G1MQEQz5NRaMSdrnZmc+08VpPdIuAfSgcug1H9e3C8ot3O9VlNcQmI/6dG/d?= =?us-ascii?Q?FGLefoOW1PsIZ4neZ2WesROUbmjIinlYbZPofbep+vWvjgFi5tkHfl+Jj3QB?= =?us-ascii?Q?eRZXkbv3pnVSo4yklbINXplMFSc3OnJ0LsOpD0qG0Jshxn2Iccg96+gLnSao?= =?us-ascii?Q?w0RpQGnCiIgA4IKZksxu2miAxUBLXv7BCkpA5qxHmZmYdJ+m5FCkFg91waB/?= =?us-ascii?Q?BjaSZuUTF/lWH9FkisNvbr8+jJs9qn318jEnPJ7+if+pxYozEqhjt31CjhHs?= =?us-ascii?Q?0pfBOS8/lW+ZVhXiKAictJ2jUFIYFIGggHxIZ7CTZ6QpstHBiUcSzAkK5nPL?= =?us-ascii?Q?dEe7DYKPcy1MKeadgPrZ+5UAbdCzeJX+F9Jkfuy/M1kMtGRs1Z0lv3vX1GlW?= =?us-ascii?Q?a7cSzXNV5s8YkQL9U05hPAAc9No9Pd7BqKazf+3qYR1msXJbq6OJsNZY0Ey7?= =?us-ascii?Q?7eK3kwVqBrb2Gee5OQXaKkzjcOQ9gf9NDitcyYKK7dOU4DzoT2GwQGyvEIRf?= =?us-ascii?Q?8va/si03GB2b+8RAJlge761JFZuWQVbV/GU0fBn+DpIVd7QcIiuCpHIuiATr?= =?us-ascii?Q?vbfPOWiUPAF9GiK7nGRhGrvjtGKPTjVMotJMiJSKyVAN+wDoo+7pqmlqwdVY?= =?us-ascii?Q?zAolY3pmyxg0fs+GKrMnm+60AUAdSYbvocpgOqWNblc3/EOYrt2ovvjjLZWq?= =?us-ascii?Q?iw=3D=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: b5f220e7-ac35-44d4-1a42-08dbe4fbd00d X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Nov 2023 10:23:58.2493 (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: TlfXEvbp6Tm1weL9skKqun/U/eRIl5NVw5ZuneGH/ALiwcVKrBARJIsx1czzRpF7TuPbLLDq8hspMo2LiICXFw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM7PR04MB7013 Content-Type: text/plain; charset="utf-8" This patch prints out TEST_COUNT for every tests in script diag.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 ] Having test counters helps to quickly identify issues when looking at a long list of output logs and results. Signed-off-by: Geliang Tang --- tools/testing/selftests/net/mptcp/diag.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/diag.sh b/tools/testing/self= tests/net/mptcp/diag.sh index 541a9d2d128c..4279bb59939d 100755 --- a/tools/testing/selftests/net/mptcp/diag.sh +++ b/tools/testing/selftests/net/mptcp/diag.sh @@ -5,7 +5,7 @@ =20 mptcp_lib_ns_init ksft_skip=3D4 -TEST_COUNT=3D1 +TEST_COUNT=3D0 timeout_poll=3D100 timeout_test=3D$((timeout_poll * 2 + 1)) =20 @@ -59,7 +59,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" @@ -109,7 +109,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" --=20 2.35.3 From nobody Sat May 18 12:05:10 2024 Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on2077.outbound.protection.outlook.com [40.107.22.77]) (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 CC31318C1E for ; Tue, 14 Nov 2023 10:24:08 +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="p6NarlL+" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FkRobkd/CDKrSP3hflQZ9krhGiUKggpcO83yBfT9jxK6vi7mbmtIo2D9CuT/aWV4N4pPHJNezprz1mUmopheQyCnMgCg80/eloHiQSwKH9oPaI10O8QtzEaT1dIqFxPTIEdFyFtGaErphfXOq1LgIZBcDrKUjU/Odbp3hPYhpRG2GnYtyxZijq35QfBO5LP1r7QXVRvgZo7iwGtTjh2MHZuaR82N+nb5oeOOdXU9yUgEONgWI+2Ovuq8clY8AU/dGRwq6gIt57GI66ZIIy3pvsJvaYxVu/0KH/waypSBrI5Hxn3+Wqrt9EoyPpWsD45zAqkMam/e9adDg/G+WSjVkA== 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=e/gQyUaHUhRxW9N3xngLMLuBruOs0x9K+AgcCwzAmQk=; b=jVhid/kDKrXDiwQbNYjkJMLegTv4+DH+/MNWAVUXgB4d4K5kPWAV90NwL32SA1ldPA8lCibiCTDhoLz4ntdf/6q4/tVlHMUgpYBE6nIO+kH+Ma8gyIhCvOzUt5sjlD9HMpHA+zLROo7HqVgZkXsKafhaG4bSyURhDfO6/ApxUUwUc0zyMxNbUlJa3soo8vlSU1iK87DpNMlp6DEBtmtHdLDHCMelJzlNC+5XRqcbY7TwpR7nm2xuc7eUSWyDzfp5DIaElp5YcXgx1c7eHHVolICcGZlK4CGEK8y783z+/xfWn3IumBd7LEFLEIjlelmbBl39d9lYXmILmgwrB4r0Fg== 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=e/gQyUaHUhRxW9N3xngLMLuBruOs0x9K+AgcCwzAmQk=; b=p6NarlL+EeLeXjyB1ibPoThJrL5aPffAEsNbU10B0HknHNAFtksgOroBP+V13PP2eyld2jWOXcPiScUvWYZSFbZUmIVjQKstoEuSOAfeyihFfKx3UmwwO6cZYKYjiOkhmyi/plATcu0fWx/ZIfQ5HxxTCIPR22GGlP02B1DmVvgLl485RcOgM1BdDBAtJ7hwZtU1AsbE5wNEeURvqWHcE3FwtEFOgzY9nVCu2eyHemE1WKyt0f8LewB0VuGMeLTwyvqxXa7kLX4VRA9aakuz+PwQMaHEk1Vckv8ze0svpdXQRvAA4kJlJpS2Y9dkvXo9m8bl8SDoLXc4/kmhG8H81Q== 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 PAXPR04MB8896.eurprd04.prod.outlook.com (2603:10a6:102:20f::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7002.17; Tue, 14 Nov 2023 10:24:06 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::7102:259:f268:5321]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::7102:259:f268:5321%7]) with mapi id 15.20.7002.014; Tue, 14 Nov 2023 10:24:06 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v3 21/33] selftests: mptcp: simult flows: print out test counter Date: Tue, 14 Nov 2023 18:21:51 +0800 Message-Id: <720c63a7f1b3c38a61188e3c9e07f193b29730dc.1699956980.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TYAPR01CA0160.jpnprd01.prod.outlook.com (2603:1096:404:7e::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_|PAXPR04MB8896:EE_ X-MS-Office365-Filtering-Correlation-Id: 9a696761-621d-436c-e1af-08dbe4fbd487 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: G7XYFB+UhDPxPVhGTvHouq+/HgnPUZVi2Nf6yTEcEN8PzTFvwaxbEUtcvgxSJ4oEjF7Mm2ZvxHYFASsAit9siCRLeeEJl11HmoOTW/o71Su4+wMf8JJ2rlLP+gHHbr4h5CXYYW0GvWjI63NX1cDefGo7q3px+7ineemwn6XedaiQkHuR2qYn+bGPKl3wDsrSG9H7dz+KRu2yoKvd2/nmLiYlt08PWssoAl/K59l1t8OhV0H9MT9IPTY5LqJ6+jIZg2f1VpSIWMgEMi2N3YI1+sfGYKNfAnLkMLWT9MWuz/1myAoqGv/p7ncFQHIOK6OOa6mrMZmlGmC9N87z9hC3sEyvT7Z7bo1r3E4TnMxUiq9PF8wxZgkC1F01YxIH9erHAZZ7VIEfkbnDAmmGMdNdnxIChcFyJPd/HEGbOnyoaP2491qQzzB2FYSRPkcSrXIlom6g6b8vInosDqrOt1LuDKa9HVNrxGwYr5LZ6YRkLQyTVfr5l5h76bvNpOG32CKEIAaOTkAIcUG+SiJ5eQ83KAUj+Zu5wqkvyBWo3mw2Re4D6IJ0pdkmPKcbax1yn30S 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)(376002)(346002)(396003)(39860400002)(366004)(230922051799003)(1800799009)(451199024)(64100799003)(186009)(316002)(6916009)(66476007)(66556008)(66946007)(478600001)(6486002)(38100700002)(44832011)(6512007)(2616005)(5660300002)(6666004)(6506007)(4326008)(8676002)(8936002)(26005)(107886003)(2906002)(83380400001)(41300700001)(86362001)(36756003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?wXhJqr7matQiHGI/UfiOcKJsI8JyWFftx6g31TlttN348HY4Ec5Ip7A1wipK?= =?us-ascii?Q?ZPHwV+DGOwOMPTFid6n7fSDTpNFsRFHQuHjUilHudEGc/8UAsRmBWvUklgD8?= =?us-ascii?Q?dFSKfem4BpWIlr0eOqR1hm9lYeYgA6uQU+vIzisEFpkowmNOL85vu+cmyvIX?= =?us-ascii?Q?ipjmH7xy+VlcX/YSu0HRu5ROuNkszn1SO12tmTvk85f4kWKwDBV77QGWYAE4?= =?us-ascii?Q?gcJNaJqlAb5rT+fjwMc19P10H0T32zyBxVarJ6rGAAknIvHGaJB4qOUGyK+1?= =?us-ascii?Q?KK/MJk9PFHiKYhLmJyYQVxW+YOmuI6MYX1LqyLhYX3Gx/xD+Jy1sxXp1QW5G?= =?us-ascii?Q?55MaKYkMftP+wrEMeFCByPAlqeMD5q0OPEKUiG68Hs4yygHQGA/CZymZj82L?= =?us-ascii?Q?5I1KUNlBm/LTK9uEFSQ0dQ1GAM2e3V8DlPNChcmpqxzwTefsTjtQn9umDEDK?= =?us-ascii?Q?wcKcNeEL2so8lNfMVfzV7YTyBFp791l9JuZRFlbqUST5d1vOlSaDt0MM3XnK?= =?us-ascii?Q?GfraZYD/RwdNOpc7zQEhMR5Av5EnW5UlGm6Bkx8ViM2eggWuOFkNIzmUWmsw?= =?us-ascii?Q?dzqTM8vpQGnJh3QrkrrP9lsgTxIo+y290WxuBEseJNz2oJpfgfXx0U0JDOih?= =?us-ascii?Q?xx6igW30/yxZ0hmb15Hf3Unmmm6ZncUcfuIX5/NMY8lR0okP/CEGDu7bp7YE?= =?us-ascii?Q?IJOcIpWPUluBFMMSHUAH15wOmYQDIBe6lnA05LGtogFjLMwXv52LUC7KdwqJ?= =?us-ascii?Q?BwpqKEXW5vppfIx74tQsxhun8NcNwnLD7FbNT4RXGNH/uugfasLSPxvoMQh2?= =?us-ascii?Q?YXKj3w524sTDYCVZb0zM7Ku+dPFl/jHASf+XAXX2ojkfkWH2s1eT4eJmP4PQ?= =?us-ascii?Q?Uf8fSkoc3oTqTKKhazu5TtwAhXqm6n/t9jC2WlmQXJgfmWx6gjM4xM9F2E2T?= =?us-ascii?Q?xssR9SUgPezvpQQkDI5coVkeXqkksXhJeAd0Dtb807EFabcc6lvap8Or0PH1?= =?us-ascii?Q?wJ+NCglc+VW86kCfcQBoKOS1O4tGSr4H1sKoE8cV68gWX2L65aThqwgwQ7gO?= =?us-ascii?Q?0ceowdCyWTp3kl77r0zEdI2LMRveehnXGMtUjDy+zpya9gCBAhdRybLhbJs8?= =?us-ascii?Q?2ueT99V7c/nzPeX0MDNf3t47qELl5VGyiTkbwhGU+srxwbi5zNWrxpbgZ86i?= =?us-ascii?Q?vloWNfUgf8YYYnEULp5t4N3G0+P0LWcAU1dTd1YAEX4m/eC2KID0OLP8A5CD?= =?us-ascii?Q?jcUzM00NGeZuvFb7mE8jjSSCHcsUFDDPNDNS1jdM7mpGhmOct6yfZGDosKwM?= =?us-ascii?Q?haqYwfJVJpYf5hCWU2m+RBm1Yz2xzxK40rtoBPYHRJAufcBQrmURaOalEfyy?= =?us-ascii?Q?GS81Wcf1FsQa4ObvpJa2q6gvKWZrnwSXm4lMBtHMW2BE6pap6MyiHpPld9OD?= =?us-ascii?Q?AemJfpbsZ21OYB9V03KrjgDSqiv3w7gWvl2PMhh4p+KYJtyJDMB+aTVQg6Yl?= =?us-ascii?Q?NBRY/9sAA8ogPpdeeZ7FpI1LZmNovoy/RnYn40+iak5rZ3z+nuXvAsL7Bvkl?= =?us-ascii?Q?pMFosLec4SgUTkv5Gijr50JbXdA37N8Erv7fOY33h2CDJmNe0ET6JBjBEvCf?= =?us-ascii?Q?Ag=3D=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9a696761-621d-436c-e1af-08dbe4fbd487 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Nov 2023 10:24:06.1984 (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: lJq2skkXxZyW5wzKQcvSDlD4tuPvuAp5+H74/XfrploYpq5QhXA7lSFdq2EyKq1NNLqJ9cYOrgrvgvZAGWtGWA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR04MB8896 Content-Type: text/plain; charset="utf-8" This patch prints out TEST_COUNT for every tests in script simult_flows.sh. The output looks like: 01 balanced bwidth 7411 max 8456 [ OK ] 02 balanced bwidth - reverse direction 7380 max 8456 [ OK ] 03 balanced bwidth with unbalanced delay 7434 max 8456 [ OK ] Having test counters helps to quickly identify issues when looking at a long list of output logs and results. Signed-off-by: Geliang Tang --- tools/testing/selftests/net/mptcp/simult_flows.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/simult_flows.sh b/tools/test= ing/selftests/net/mptcp/simult_flows.sh index 6a4568d8f596..a9e14698c179 100755 --- a/tools/testing/selftests/net/mptcp/simult_flows.sh +++ b/tools/testing/selftests/net/mptcp/simult_flows.sh @@ -8,7 +8,7 @@ capture=3Dfalse ksft_skip=3D4 timeout_poll=3D30 timeout_test=3D$((timeout_poll * 2 + 1)) -TEST_COUNT=3D1 +TEST_COUNT=3D0 bail=3D0 slack=3D50 =20 @@ -227,7 +227,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}" @@ -236,7 +236,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}" --=20 2.35.3 From nobody Sat May 18 12:05:10 2024 Received: from EUR03-DBA-obe.outbound.protection.outlook.com (mail-dbaeur03on2046.outbound.protection.outlook.com [40.107.104.46]) (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 776E618C34 for ; Tue, 14 Nov 2023 10:24:18 +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="hutnpX4A" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dtBEhnAeM0P0mPUo9ri2vlKGQwBQWohHlfeRw9kgVv7sH4iFdDCEOXlMuTO5ua4I2KwdZ42ex9KhsvoN9vivNzcFJNYCmTYMbXY5asCYwRrukjApo9gDjin5VVDO17/QGLh+F1WKKQQS2dEhIwvuYR880NBSk3KJ3Invq6PoAQXfnz00Z2wbOV0otPecojMbGJibEP67CY4BHao0GcjgG7Cn30LMESt6DgIVkiT2cXbpuhT/DIpz0wos2sLmt+7yGnUuF4djy1Ef5xT53lO7ht5ZJHl7VnI55ZCpt1QEVdk5URFS6WF3ZaJC2d92+huAoHsUUjOracVC7Aakd30iWQ== 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=ZiPIx91PM4eFoIGvm9qwP2zqSLV31oIvgLoyNyBYWug=; b=B9FdYkJBK2LZe1cG1/ZWX7DZgjoL5FGTVogpFbby9RViFQ+a2oD5N4+0nMWh8DTQo8OfzBTPQo2bTDPZ+qjwBIUy9s0L4e2EJGwZf0N2gUT7J9ADeoAiMMyoelkhjJgheDZANmka+0yRye6S8idMa2+E5LfHsPgck2OKIbU87nHfTVFgcZfnyqhw7kG+nXpECSv2Mi4jq2KK+kRLP+09xr5h3SmhvRQlZACMSFWv8pqBT6Ossij8L6rKCjSDm3FYAD2vlhw5n1Vqb/XN/IhRlBh0NfrMzi4zX6pLubscJ8cTqT3+HCPIPg6J454jKpa+wR56LRMq7eXmqJEOCitO/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=ZiPIx91PM4eFoIGvm9qwP2zqSLV31oIvgLoyNyBYWug=; b=hutnpX4Alt9vwAwpn5xNSv5jXyWLKEU69TFV8tX3c06WtX/qc/9xQR9l7YQ//ioKDOMAQKF9XIjW26wH5aycWuJNoFXCaJSH+4pXh+wL8kjCVZxO5Vq/Ayxx9IoW3+MpzIzqQQz3qcc7fYzvpHIUVbFcy7kzFIOSLsQ/EuHWbMh7/QN5Dhoo2q0Tq7J+m8Sv1tgcVa4HI4gt80VgPd8v2fFGJ7Q/qINzt2zKSz1/KaDnWlNV4beVa1U3FLPBEkhvpQMLs1j6ktQrk50XnGilGFkk04y6ufAPJ8YBm4hnom1f1AKAh82ixx9L/GmlSYcob5MA2a5C0tDO1KvkLQl9GQ== 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 PAXPR04MB8896.eurprd04.prod.outlook.com (2603:10a6:102:20f::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7002.17; Tue, 14 Nov 2023 10:24: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%7]) with mapi id 15.20.7002.014; Tue, 14 Nov 2023 10:24:12 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v3 22/33] selftests: mptcp: sockopt: print out test counter Date: Tue, 14 Nov 2023 18:21:52 +0800 Message-Id: <9d1fa8c8b87a8f7103815463a218bccaa9aaf366.1699956980.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI1PR02CA0024.apcprd02.prod.outlook.com (2603:1096:4:1f4::12) 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_|PAXPR04MB8896:EE_ X-MS-Office365-Filtering-Correlation-Id: e62f81d3-2168-44c4-1337-08dbe4fbd86a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 112LQTXfiTfamKx0Psgi8nrsp9NofXvc7Qatb3Ce5JEvTnsE19tQJvwbbol90UdzML4Y/quyF4+k3S2xtgBLJZCi/X1UL+xkYQav/AjYoz6sodVS5YUtJR8GPXRQOmdlo7Lp4V8jKK5V8vdgc/iEClNFadaraR5s7gsK8gBM3Y9CLpN+kgvTn5ZSsqrGv6WFiglL72ryAghCFQ4F2JJ3p6O8lr8h3M1B6/YGPbR0tlqFgH4wFFnMMR3j+YfJ1Qn8bRdMVRJEHPfr5Wvx59mRduk9a+0PMD08QkbTlf7XtFs6CzuGpOpkJt1cqRzehODJDuP767XZtV8n7fBoiXNc2+x+ktWvpo0BL2KlSuZtTETvLXyKEzDGkiWM46UK/MosUVT9ETXN9goUGGPqaVYSbaq0in81FtfgBncrU0iKGQJ25vm/3TkL8jj8ELMhEUfoMniBeLtpXk5fBEo/ZO/QrJQo19hMXISzftLQS3Z5QJCaLo3Udm9HI6fUYywupeche4CnNzTtzHJIaURJteiKPyQXZQfxRoHeutFuisTXQo9XQLiQZrrxWg1V2I2v/FZn 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)(376002)(346002)(396003)(39860400002)(366004)(230922051799003)(1800799009)(451199024)(64100799003)(186009)(316002)(6916009)(66476007)(66556008)(66946007)(478600001)(6486002)(38100700002)(44832011)(6512007)(2616005)(5660300002)(6666004)(6506007)(4326008)(8676002)(8936002)(26005)(107886003)(2906002)(83380400001)(41300700001)(86362001)(36756003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?bjMztTcKSsSKPgr8zpreeDdJVxJo7hVx+NE46Ioq6G4hC94yWtyGfTz6iyUq?= =?us-ascii?Q?gBk+ZQDs1YOi7I404B9W1i0KyulfH+ila8zPHiJHOLIKcaphsOoDgjuogRZr?= =?us-ascii?Q?tA+K/dS5U5wMwgk9sgvavmKbtZMqjlKG5pXUnp3bHlaXq4393G6duGhmDXW7?= =?us-ascii?Q?dKrbydCOPDGGTe6ir28vOlmTDtvZ3t9wdhFjSnfZlWX/dQ5zWEN5NG3ZyKKw?= =?us-ascii?Q?9oJCqBIbdcAABFyPGqTtlaSII8zqh3GIF4vylAHQ2Oja7bSyeZatj2nwrXNB?= =?us-ascii?Q?mA7tv1HWg73WtYQREpizMP9/RNdAYk2GtXHmgq4sLRJ/Sh1asSJd6Ash0tnF?= =?us-ascii?Q?4AWdavCyE2ECaQNcDtVtgzp5Yf4cYo4ZJpOJOZ3iMpwl9PuVypGic0KlRuYg?= =?us-ascii?Q?U/pOmfmhH+nBZixmgEEA7WnP1ru/6nNqNq6iMw7JtSPkdp3n6soOy3emJ60P?= =?us-ascii?Q?Qq/hIB45gAZaUZ3oChgpU2euoyS2LEdaw94AoBFuMrYPmcKugMdCGRGSII4t?= =?us-ascii?Q?oL2dL/jE2uBQ7Oi3QJduNeVDO1HbofsuvHXNeF2d8H+zqjJUm8nJ+MEe+OQR?= =?us-ascii?Q?etVOm6FoAMmNT9hnEYwHU0fPoDiKe9c/17TzsiJ41TmtHKuWRKPDLixnXD4u?= =?us-ascii?Q?cWesCIk8TsBiTzNkar/OaVj+QElKgUp1Rd7FnFjyI/is1Ih+uhJEbnlCEO8Y?= =?us-ascii?Q?EVMk/rAfaZKJrN8qciDNNIifHQKtYilJAeI0mrukx1Ga3ZZojuWg7MF6Ut7L?= =?us-ascii?Q?nrs0LLA1TR8qSPfDtMopcgReWHQ7TsfB7AFk2T0KS+Ih4xmEzPLvt22RUECM?= =?us-ascii?Q?BntL6X3x7l1hCuFzIux3htmpPinx+Vx6cRdCbvsbfxEGmruD0qdPE8BYmmXi?= =?us-ascii?Q?982v46M/J49hT4rGFi5hQbkc6n8Ilfw9mAMqBwoFlCReONSMPeoy7EhCsHgz?= =?us-ascii?Q?im6+kT2Ho/V7EJxpLTpfRAeyIOfS5+t4/Qj41QcyT9m1WnNM9Vu8XtaHzO/Z?= =?us-ascii?Q?KeyiLAvYpiOz0W5d9fWU/rCWA+vMEREWZmlHwv5zpwZMAGES1rpcyisLY6lQ?= =?us-ascii?Q?XbHJog+TVvy0SCO3gB8p52UiuLbK+BHp4aHTTQ+gjQ7pOnNial7BRXfhZaRl?= =?us-ascii?Q?+pF/6gWLGFkhWLsizGlnl/efXcr2NhX+jcBIQ/qIwnZ+gLoKdWtxWUS8p0kx?= =?us-ascii?Q?Ne7bD1I/o1mxSwLo8+OAHCpdzgqTRQP4flzTSf1HfFL1u1uZK0SBuiRBR6uK?= =?us-ascii?Q?MQwz4IIbAIHgr/pt1+q2YmFmvtI9vePRA8P+63+M9XVmsTebc1bxW29I55yY?= =?us-ascii?Q?Up6tD7g5sPsRfJsZhrAJz5i5UAlj28GGjkEWCZmlA808GKjPr3HkF2NtU2LA?= =?us-ascii?Q?N7Vj8xtlWrQdOfmW2SkWwu7nYDltd1ELoEVJCzLwYoBmTXWr5cSc8s1y+TB+?= =?us-ascii?Q?wSYF4HnR/xUmZs9j+SU/wfOkNq05Ir047NLoh5dXexIWDF+s6iM/uH6rKAKi?= =?us-ascii?Q?1bZbyQcdOhpVQkSXRG/jz/48wunv7UAP74+mhID21nKxtQWFdssfBicN/mtZ?= =?us-ascii?Q?d4uxg+YV+HOpplsmut8E9CoCHrZZhLnaC0LNfC7XQndHx2aCndQosnfwYPDN?= =?us-ascii?Q?QQ=3D=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: e62f81d3-2168-44c4-1337-08dbe4fbd86a X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Nov 2023 10:24:12.3798 (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: 3YxUoQr6UWb4Y3lBU2mQuvYbnTu0HF3Yj1VwZeqFIdwQxkp9kBflE2X5aF+25nztRbSO9b5BbDUGjPV4c4+6vg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR04MB8896 Content-Type: text/plain; charset="utf-8" This patch prints out TEST_COUNT for every tests in script mptcp_sockopt.sh. The output looks like: 01 transfer ipv4 [ OK ] 02 mark ipv4 [ OK ] 03 transfer ipv6 [ OK ] 04 mark ipv6 [ OK ] PASS: all packets had packet mark set 05 sockopt v4 [ OK ] 06 sockopt v6 [ OK ] PASS: SOL_MPTCP getsockopt has expected information 07 TCP_INQ: -t tcp [ OK ] PASS: TCP_INQ cmsg/ioctl -t tcp 08 TCP_INQ: -6 -t tcp [ OK ] PASS: TCP_INQ cmsg/ioctl -6 -t tcp 09 TCP_INQ: -r tcp [ OK ] PASS: TCP_INQ cmsg/ioctl -r tcp 10 TCP_INQ: -6 -r tcp [ OK ] Having test counters helps to quickly identify issues when looking at a long list of output logs and results. Signed-off-by: Geliang Tang --- .../testing/selftests/net/mptcp/mptcp_sockopt.sh | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh b/tools/tes= ting/selftests/net/mptcp/mptcp_sockopt.sh index d03f9f9daa39..2aff01813058 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh @@ -173,7 +173,8 @@ do_transfer() wait $spid local rets=3D$? =20 - printf "%-25s %35s" "transfer ${ip}" " " + 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 @@ -189,7 +190,8 @@ do_transfer() fi mptcp_lib_print_ok "[ OK ]" =20 - printf "%-25s %35s" "mark ${ip}" " " + 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 @@ -236,7 +238,8 @@ do_mptcp_sockopt_tests() ip netns exec "$ns3" ./mptcp_sockopt lret=3D$? =20 - printf "%-25s %35s" "sockopt v4" " " + 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" @@ -249,7 +252,8 @@ do_mptcp_sockopt_tests() ip netns exec "$ns3" ./mptcp_sockopt -6 lret=3D$? =20 - printf "%-25s %35s" "sockopt v6" " " + 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" @@ -279,7 +283,8 @@ run_tests() =20 do_tcpinq_test() { - printf "%-25s %35s" "TCP_INQ: $*" " " + 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 --=20 2.35.3 From nobody Sat May 18 12:05:10 2024 Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on2070.outbound.protection.outlook.com [40.107.21.70]) (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 4B8C818C39 for ; Tue, 14 Nov 2023 10:24:21 +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="TpRzS8Nj" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JWAEa56xUIjpNQX3l+XNFD0xY2c5At2uPAZ/MTmx/lI64lvmkHfIGqHdAhs0cVZ8rPx+kPWAmg2Pe3QhzBv+RG7a3py15YPp32ZBJN7aUS/6imQb13J2O46z0qMjMTGNUjYW9Ul7RzfQVIOnVsYwZt0v0aT5bKwJtXUEaNi9MqqXqLQArT/mhrzbaTy1e54ISEZxwYsuNt5J9Fw+DWKDXhj/RpnQyp/k15nzz80aw6jjweV4d1s4zBN0nP168znxqFTIqyY2HI5QddTj7xo1aQ3mDDkqqY4Biv+WmKjF3BtVwRXRGraF/xnYskwXD3AeSp4VnE4kC54SO2T4BXotIg== 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=zYr1NMFMKvfGcN0MRxRaig0LTgbAKiIHMgkQ7i4xZF0=; b=VUDwHxuRVkcs8ptJR8xEuGV5vTXJvPgNWdY27/rVanv+wCzatkd8eVC85p0KDRN1jGRbsKUgetQsvWziPOIbdNxZfPEZfy+KxfdYSa0Ms05ubBKY6PW9HLG4S3H5frWm6dP67TSXnw+c9TrN41ylnYzcNlTRdy6HEMA5lu5UtPcouwJk2sH2rZ7AOQDGLJsrwroNbMuI3KgOZc4VVpbwA3gtO1rwfF9T84sQSdg6HVtHhLhJCLzMZslpA96broqy0/Gt7NQ+hsxrA1WweJ+6X3SPfkapVEc18ym69NZin0x9uGP7S0yr/A34mQX+gqDZwtoNlAJPTHgbGPuEG89DAg== 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=zYr1NMFMKvfGcN0MRxRaig0LTgbAKiIHMgkQ7i4xZF0=; b=TpRzS8NjnRPSsEuBZTffksMpPYEOL1+1HMzkmpJO3MbQR2pixjWXrVqmHsquuNqL+9xC07oDw2zuIgpUCnbAXc6H1VOjY18x9g144zBkHbNE281cpscdtDNN6cRU5VWyrTPfqsauFxOFDEGYRLiymh4V3gy76XdwTzq5EZ8q7v/bS4IAQtbusO6d4GlzRIiZazU5IctsTnCYCCEEEocoqnPjXjkVKXFuo8JYLMfbkCN97/y4vctk3K43357c/y6OxIXXZsPn9A8PzCbK/KRZFj/a2Hq4QMujI7ZMEhumTRJ5zNcfWm2rhRgSrLxjuXzAUqIplAjnoQQXJuYWHTMEKg== 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 DBBPR04MB7946.eurprd04.prod.outlook.com (2603:10a6:10:1ec::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7002.17; Tue, 14 Nov 2023 10:24:18 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::7102:259:f268:5321]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::7102:259:f268:5321%7]) with mapi id 15.20.7002.014; Tue, 14 Nov 2023 10:24:18 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v3 23/33] selftests: mptcp: netlink: print out test counter Date: Tue, 14 Nov 2023 18:21:53 +0800 Message-Id: <69739b815bd03762c20576df7713512cfe239876.1699956980.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI1PR02CA0020.apcprd02.prod.outlook.com (2603:1096:4:1f4::9) 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_|DBBPR04MB7946:EE_ X-MS-Office365-Filtering-Correlation-Id: a927ac70-7fb8-4784-47ed-08dbe4fbdc0e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: mMx0fX+XdrGha4tNs6oLaAgmYtSyOXS6wiTqqtRqT4fJhVCD3XHsKiFhxQuXTrzCfdn0cxySwOq7CXwQUxVIZiFixl5HSUkwaNFJE8xXz413X4ErhbDfgjtBhdhNNobx3asBbxhYvhsOmmC3SRpeR3axxEGpAJ7c/8qv3/jRQcmLO3DMlIaUp7KwdMklnkeGm5AbyeFzwvFzmz0Gxn34DG5v6Dwgs8dLK+koLTMA+qkP8XEPKoBT+0dpfAFcx/JYZrp58c4yrIxnnj7AeZJy6WU6h8BxydNVnc/OvdGFg/GuqRUE+p8PGCrKNt2PO0RJ7fy6R81DpGsDoemO2TbUrzYMwfEY39K9ASl+4d5yxooJHXPQEQISyy8FHixlvL9RoKT2WU/iTcUTvEoW65kX8u8ztLfINPThOwA1dC6aL3qT23syGVY66GYNJWlrefnxl6t6q2kvBwSMDLQL/8YdosGdDSINrcIios9DiBgo1VZ/nyAAxhwGfdtSkw5sO4Q0RK7dYI4bHKwV8EymeOYbFVO22FK2ITbmpgv4cGfisSbCOwn7nBy3LHimzY2oT3HP 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)(396003)(346002)(376002)(366004)(39860400002)(136003)(230922051799003)(451199024)(1800799009)(64100799003)(186009)(2906002)(44832011)(5660300002)(38100700002)(86362001)(41300700001)(2616005)(107886003)(6506007)(6666004)(6512007)(6486002)(478600001)(26005)(8676002)(8936002)(4326008)(83380400001)(66556008)(66476007)(6916009)(316002)(66946007)(36756003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?IEDlHpqN9XPZg3n+BE+FaPEaiRdzIDLxC6D0ZJrK9pN6Mgp/BsN3/qy62Vu/?= =?us-ascii?Q?0kjXwNuxWovGoYV4FyVHqTkWry2C1ITmfGJJQrf0RWIFzsgLzIdhCMFJdQZA?= =?us-ascii?Q?hZebhR0ZPNanVgPqGDQPXMQWh6q0CFdqAfKn2mtM2EAKUvR6dY13YiGZNGjz?= =?us-ascii?Q?3AxNo3h/yfmzF0ySRCxiQMf0e4FJ/qu0GZkqOuCClNV/BiwVQPoY6ES3k+xb?= =?us-ascii?Q?oMu3BDffrXLgpnwQxagaJ755L4sRYA34zmxvsDyYI0VPBe1v42g1OrSZ8nu2?= =?us-ascii?Q?BnY9ReUqQzL0h0jJ7qrQV+9FJOh2Kox3DQJuxUW+CrcCnGKsdtOBjReN+C6i?= =?us-ascii?Q?UCcXgyxtg8cmfSt2CPaaPekT6sCg5kJqAac76Ru8VmsBBF81fKAhv5IRe5o9?= =?us-ascii?Q?quCKOQNIjEu3/1gDYcqYtFmv5JjovmypNXPgETd0Egdd/hjorsdGUWvcYJuW?= =?us-ascii?Q?Sv1ghLmA6LlaUQ0kis8/steh5zW1tMIxNl2hQl8SgAa0Hzvox+pN8eEw5QKB?= =?us-ascii?Q?/INjxamt3ETkiGt28mNOxIUNIPEDTvJFhCc728u171pXXm0JG0f7mEnVuoNE?= =?us-ascii?Q?mZEjKrDMkwxX9oBTrg6JfDfOE4Q18LVX0iA7gZvDpmuFJC+wa49DCujLU/fv?= =?us-ascii?Q?o10GjdWTn3AWtcMgk7hznistZrSVz0uQl1opohQvhwno6Jvt3P9XSezeIOWU?= =?us-ascii?Q?hdendd81/X8RvLX4Ar3ZScYeevMn4eKX4vREsAdGBDcUUyN+fXXc9lVHqJ3W?= =?us-ascii?Q?FVZ8skWWqgCqsrENt4ihEGg3MTkToB6rfTIYqokkvwh7g1WW8/WFRvg3x/k5?= =?us-ascii?Q?9YLVpeo2iR403WqcY1beBnEe/SAmEKTYn9lEboOYR2GQtQ1rBl0MvN5Vj1ca?= =?us-ascii?Q?I84p+nP40lJMmfbyTjvmilOXftxAkCFqgf3xy0ahvqpu4wvUkzAwHQthulpw?= =?us-ascii?Q?Szxc0X7yI5OZ7V5zX/SZ/T5ys5baxEDdk7RCV2HSrU00TkEU5MDQtcrDHVVb?= =?us-ascii?Q?uUxLfHs/4zKnrwyt9DQPiLmRDTuUi3c+t7e0joSJr8JImnupj88S5qCoI4XH?= =?us-ascii?Q?iE18gtpIc97TM0JjmYSCTE75arq8Kt3/FXNtxSB810Q6bDaFX8LhJOfQzKON?= =?us-ascii?Q?9aCMM2c8VfIKCioIDxQzf0MU+xagVWFSJwVub5LWGJvZGg2QpWN0tc95lvSU?= =?us-ascii?Q?iUb3nKMHke/Ts2WupRxGU8hQWW3+0JDm0aoKBnSejOjgPCmVcvm8lo/5HQs9?= =?us-ascii?Q?w9injEFJNfPU4kaw6ipi+GVFVxAAoiZzGEIz/ojJ49959ZTzOBz6Y/qD4ftL?= =?us-ascii?Q?U84qt/WtgkLAJI7de5XX3O53rd5rWXKPsO80+Z3WDOcarD9alRN+RYHjxOmD?= =?us-ascii?Q?AsOZ9Ibzuf+6iRIehbSTCTE2fbqTmKD59ELDJ1MaAq+h2vQR3JqfN1QHbx4n?= =?us-ascii?Q?rNRhQRDUQz17lsaEV44DbCn3fbdIQUBBAyVA2KQWiiM8ymwyh5PwXyFUQXx2?= =?us-ascii?Q?fKE1gC8kW5Vrd4Ir/KAk69DT0W1SPrUeGfsPzZ1stkx9FLEvO/JuJzDZr8Yu?= =?us-ascii?Q?Gpknk5ESfycHF7LnZS6rktSf/F95B/pf+0PtCcosxsfVDUM7F6l+QjgWaRMY?= =?us-ascii?Q?GQ=3D=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: a927ac70-7fb8-4784-47ed-08dbe4fbdc0e X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Nov 2023 10:24:18.3867 (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: unNsFgBxAEbVhXvLE8g0Rz/i40rP9QDRH0uMgS9EjuUoi3MTz/GFRWLF16JjgefivWFZXchZJY38Mi8bSftqug== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR04MB7946 Content-Type: text/plain; charset="utf-8" This patch prints out TEST_COUNT for every tests in script pm_netlink.sh. The output looks like: 1 defaults addr list [ OK ] 2 simple add/get addr [ OK ] 3 dump addrs [ OK ] 4 simple del addr [ OK ] 5 dump addrs after del [ OK ] 6 duplicate addr [ OK ] 7 id addr increment [ OK ] 8 hard addr limit [ OK ] 9 above hard addr limit [ OK ] Having test counters helps to quickly identify issues when looking at a long list of output logs and results. Signed-off-by: Geliang Tang --- tools/testing/selftests/net/mptcp/pm_netlink.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/testing/selftests/net/mptcp/pm_netlink.sh b/tools/testin= g/selftests/net/mptcp/pm_netlink.sh index 32265d4ecb41..e89b78e7d4a0 100755 --- a/tools/testing/selftests/net/mptcp/pm_netlink.sh +++ b/tools/testing/selftests/net/mptcp/pm_netlink.sh @@ -45,6 +45,8 @@ ip netns exec $ns1 sysctl -q net.mptcp.enabled=3D1 =20 check() { + TEST_COUNT=3D$((TEST_COUNT+1)) + printf "%2u " "$TEST_COUNT" # ${*} doesn't work here since there're spaces in some arguments. mptcp_lib_check "${1}" "${2}" "${3}" local rc=3D$? --=20 2.35.3 From nobody Sat May 18 12:05:10 2024 Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on2062.outbound.protection.outlook.com [40.107.22.62]) (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 C37641D527 for ; Tue, 14 Nov 2023 10:24:26 +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="UNUdWqPE" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=auup1p8D751wgpgOqFa++Vp7r7iVAyQFqHwUnIL3eEvpHD8xq4FBMCXqRAWI96jjirxiAmpuoe88GWPYXe3cD0SbhqnDnyZH2l8c8kx57JawGoulROvbZEdCV9PJeqmAaOrVIPRHccrqLVawijBkBkkL3165NRIl7Nm5MrEQnM5ZZwZuz+NEIcmoNTKJTkbTNQ4N1VLUNwG+xd0GZqfipV/klak6rv5mtQDEfQa5qGKFDrIvpVn7JQU8YqHO0tX7shkr3eRySCw3Xjjb3si/6HPzvaMB6LO73KU6YcLoc+aqQswWai2z7GpOAfotFVp0GBQ4qOZjoqoBPJ/HbGBozA== 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=ca9nzGNUs6xZshM8KaLRmTPcxbkcV0AALdy6q4A8aC0=; b=i5ZGJ4VFljaLCW73FiLBhnUzTf/flv31dKsBpdnyTSMgZtCtEJDH4FRlffaG23CkL3Ql2RjGJ0RWCmL3G3yPSaz8D6jVcwXjZ/cNFF43m9siRdiojG+x8oS60ElCYmjgXNUdw3FQqvNVPKszW23fA72buT/heW8VRxrVoXqExA9VMCtqHJDCIyce7WjRzg5rhKedB10tZt73hfttnalZRIWz6qj9LLv5wEXSZyUsu8OTJaPFkoKhp0kdgH8PxgRyfe52MINjjaDm4b7Oypy8ox+V5DD8ORR55icizefA49bjd3LiekbauYg4bN4kF0LVhFsIB419Y3vYdAGBnzC7EQ== 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=ca9nzGNUs6xZshM8KaLRmTPcxbkcV0AALdy6q4A8aC0=; b=UNUdWqPE1d3FdR+0pKz+CizM4+2xediSnNrSGDeRLX+Y/ninKqmxXb0CrbA/qxjKKMdQSRj2vzovuBMWcpNW9IjPx6dFKHjvy6fWU28VHDGlkt8yvo2yCM2l6Rf33RHuoZ6FajGQ9zld2foJYP3iS0nXfozi51QEi9pM01R7PfnL2+R6LIuIqC8QXWtLGMYQwn+kBEcZ3MzOyEpgL4LLEYf60F+Uh8DGDZBqqLXr/7H0VfxqvKcDPnn8qE+yPhXiix6EwwN0CiZRIAJgUJCRrFzY6dKcNWvvQQ2B1oxaPg2gSGpR0AtYiYIswEatYJdeRFupZV2c/RcdNGt/bagH1A== 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 PAXPR04MB8896.eurprd04.prod.outlook.com (2603:10a6:102:20f::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7002.17; Tue, 14 Nov 2023 10:24:24 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::7102:259:f268:5321]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::7102:259:f268:5321%7]) with mapi id 15.20.7002.014; Tue, 14 Nov 2023 10:24:24 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v3 24/33] selftests: mptcp: userspace: print out test counter Date: Tue, 14 Nov 2023 18:21:54 +0800 Message-Id: <6fc13e8956dbfebf53040cce1725856358129d15.1699956980.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI2P153CA0007.APCP153.PROD.OUTLOOK.COM (2603:1096:4:140::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_|PAXPR04MB8896:EE_ X-MS-Office365-Filtering-Correlation-Id: 480407b3-e815-4b6b-5b79-08dbe4fbdf2f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: cGfiAJrDXhAhbS8goNthMb74RuNd49TKDk2ethYuSVK0N6pv5W3CbMb50hM3whFtaKBz/txlyYLvs5gPrqD7o6Bzkv2BywBZX1HqANBD4HUcbe48NHDkV7zi6X5eRMxafSaL1zqAgHQd8orlSmTTEVfOAdQQ/o8xlg45KhppiEIypVoYGo89ynzBdVET6LiLeorgXLMz69EywqGE2O4EusSg/OmwppcjCjBGFeVuw+ee279xA7gWMf1X+QEgqvsOkZaSRPKYD73ZLdrwZi40FdndLSrTcMg4uThQlG5qTm7fvJS8FwxnL0AIqk8Dtn5QflKh5XDNUD+GR9IemNw/ylfNbhQoAOLsqcoJ1zcuh2v9CwueiOu8O4empz/ufz5xQbhbLscLF2KxDlh94i4DTtr+Wq+xMO06lY8eoSnIcv+Oe/kNZak+qefNBbxbFDKApoHfIHOZhCiMrPYkxhfn3HPWYBCE6o8pPJEyUs1AdsmHitrXH+/gM7yc3lJ/d90omxtRjyvZ20z5pprGl4rq/YAabji0zEhK9BCYRu8u4ywj1wMj7UAH+uRrtGwAVEXD 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)(376002)(346002)(396003)(39860400002)(366004)(230922051799003)(1800799009)(451199024)(64100799003)(186009)(316002)(6916009)(66476007)(66556008)(66946007)(478600001)(6486002)(38100700002)(44832011)(6512007)(2616005)(5660300002)(6666004)(6506007)(4326008)(8676002)(8936002)(26005)(107886003)(2906002)(83380400001)(41300700001)(86362001)(36756003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?s9kbfKIAYar5Nn2DHvYvwdJBA+pQuUICMNKa5dhFctyHUshLhh3xG1OQuZxs?= =?us-ascii?Q?/Di1gOluRgMYnl8UFXL3cFvUAkKAdhqb7j6GQcNw9oYtCHq9pb6AJlnHGFIV?= =?us-ascii?Q?Xibi9REsRnSZehXoAscfWKJ8NUwomu5zHD6Ys6Zkd5B6731IDORBVWzKw/Jd?= =?us-ascii?Q?jqo4k6R87VatvDnHk8gP9dgkAbwX/QsqFUH7hNy667e9dxPt8A6pH9tRkQhS?= =?us-ascii?Q?4QTodSJyPs5JuLpt08ka4CP/mPRw1rFlC0B5THjrMKsftl4Pk25QIm8WTogJ?= =?us-ascii?Q?trN3Y1Mar6HQ9wHDdaiPyqPK4tWlB8wXzIETAPDxUXdgHKJXkrxnTsXpspVq?= =?us-ascii?Q?y5sJJw5zVNeXjzyQX/py17Xi7kErcM5FZSXRy50nrXkrFnLuJb+guetnuyYe?= =?us-ascii?Q?bDVm1K93877L5GNTo0T1TOMw7ZwC+QThBRhRvKONcUHa6l/eAKbU1at5NIos?= =?us-ascii?Q?AO9kCWCvPhZwOL/rNguH992u9pld8zJmt6rzlSdBMy7lhuQzD8+2WECLva9c?= =?us-ascii?Q?ROvla7+Cd2uNKk6Z+i4Xp+3o+codB3XneaYhqZ21EA3LwoDHtlx0klO3/oDA?= =?us-ascii?Q?RYo/zk5odUTj/4xRKn7VaIJ2H7cGajbO+UTJrns+QbhpcrP1KFkSDsCrWo9k?= =?us-ascii?Q?oNMMRJnxXcCXrYvI3CYmTVrmV91yzGtC7Wag0JIUqJme1xp00KwWuQno51KI?= =?us-ascii?Q?jVjEJiHGSHlB1qCF9DOZEyLCDMzzSQ6Qzoimq4Ju9BfQyjTtECOGfmVxGFz6?= =?us-ascii?Q?wxz1PVhjiMdzfUm/1KHk6xmlQvlZdio80rqhXj2Md/edY/3H/lWOESBq9KzD?= =?us-ascii?Q?Em8BzaH2wY6ThgdvSu+qc+bUAYeQHTabhIUxE2fJ+jjxzCsI80Bq++H47pC5?= =?us-ascii?Q?9YO7xbJS8FaKJO5tFLKK2vb9ngi6BNiKlCKh4pKG/3DyxFUdyb7KzHwxNvuV?= =?us-ascii?Q?oaknZH3Ymv2yM7Y46sKJ7gCyHtmWGwrMQ20WNLtVOmaMItJgC0bbMCXKhoIb?= =?us-ascii?Q?UE+voITkwBsVHbdM2UgwkXlr/8ScuRhH8nBhAdbfFciI9lRw/oNY009l4Gns?= =?us-ascii?Q?ZsuDqjWT0RdvGysR0LwQyH4AnPHQTAImkOoTRSGkb+jlHrO8YEUhhpDxP2F5?= =?us-ascii?Q?H9w0PU1WgiDIRjO+KYQ3XJluCS1tMtaeBk4QFt2FkB1v7EHY3T1zI9qLhAcd?= =?us-ascii?Q?3wZPupqGrIXBKq4XajMnH/Mlmo0W5ShjguN5UDEGRzLOcQtZZ/qryJOxKqN7?= =?us-ascii?Q?eVFb//po2RFFVeMoVV+ICXTPHhDSvNgPPmkIgPOrRS7iMTYTAy7Pb4aExKis?= =?us-ascii?Q?M5hkMrwhbvYnGKdMC4QVWYgowp2CFWZIXdBRvpyN7h2BQLNe4p4eGy8nKd4e?= =?us-ascii?Q?g0WsZI2hbdDKaBl/+RTKkS43dueWr0H5fbDss/PCa9gNOcvxmH4c7y0MBAah?= =?us-ascii?Q?jZp46NAZMgBTV+a9FV+wSgY3AD3JVzCiII946TncKOZx+FF62nSCcC8MoyII?= =?us-ascii?Q?49gigLl4FrhMtOqVjWx+u5WnbEg7PkX7odPytrBgN/v5rV9QioBlsOcbSRwP?= =?us-ascii?Q?HcF6geiAXL/bluO/ofkd+oIAmoSWxFqdzujEaOVncrR8HwUT5gpJNZN359Ru?= =?us-ascii?Q?iw=3D=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 480407b3-e815-4b6b-5b79-08dbe4fbdf2f X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Nov 2023 10:24:24.0906 (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: 6khF7DQk3V05BucfMbbM98/3hVgxtVn3EI0L3c+ohzu+YDAubmyDqgHK1EmHVjwXvqQtiMNRY5qmz0LAkoP99g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR04MB8896 Content-Type: text/plain; charset="utf-8" This patch prints out TEST_COUNT for every tests in script userspace_pm.sh. The output looks like: 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 ] Having test counters helps to quickly identify issues when looking at a long list of output logs and results. Signed-off-by: Geliang Tang --- tools/testing/selftests/net/mptcp/userspace_pm.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/net/mptcp/userspace_pm.sh b/tools/test= ing/selftests/net/mptcp/userspace_pm.sh index 6512d198ee23..b25456fad2f7 100755 --- a/tools/testing/selftests/net/mptcp/userspace_pm.sh +++ b/tools/testing/selftests/net/mptcp/userspace_pm.sh @@ -42,6 +42,7 @@ server_addr_id=3D${RANDOM:0:2} =20 mptcp_lib_ns_init TEST_NAME=3D"" +TEST_COUNT=3D0 =20 _printf() { stdbuf -o0 -e0 printf "${@}" @@ -56,8 +57,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 12:05:10 2024 Received: from EUR03-DBA-obe.outbound.protection.outlook.com (mail-dbaeur03on2070.outbound.protection.outlook.com [40.107.104.70]) (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 E4D0118C34 for ; Tue, 14 Nov 2023 10:24: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="p/8fXDzH" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XVWjdq+GA1h3PPzgFkDiCp7AaQxTBw11OTB3nvaAPkiqxTC+fH4yt67HounyMbkehcKl1wXyCBORAF9MC60K9ITVeyynWxiHosRlBzN5vVZ40OqrVaoya5FgSPf2F1WfEmunWUk+EC4UXNQ3zPLzqiMhofWHYnYdnYNCCnbN+9grb9wrJy3QXb6mpNiTUFYaU9zjwPOfJ+oZNasKf0s3h/DhKYrZstqrsYdg2SHJ4Yk2sPvtZW4kbDg4ZV1R/irijihY3P4clolInIhSvgQq0QC7lMBwsWjCIt52iNY0APQ4AP/dupMSBCur7j1Jg1+w62Ms7Q8lmUdlM08I67o7zg== 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=rFaaCn+LweXwfCLkz9lZ0JmO2TYwkPBbrMhpBnPl//Y=; b=GwNOkqsPSIbgbN6jSXWhVpyvVnhsCnj0MFakVnoOR5eGrT7D3d0I5vefPjKI1yeD2WoHDGDXC0pj+9m/daACIQIXRReN+qJ4A99I97ITxykPCwQY/QtTs/GEBpoV0qJcwp5XbPp8M9l0wLh+9lX6nmJJHPt4w6CdgmP2+1JKnWyAExkaEo09SB7qhaP619pFaFqTEiCliHu7JORiT0U3h7R+mkHfh/misW4Tvx5ljq5//bDxRbMKXmAPnBthHejRFIKoTnFD8K65wHRMLnirjxLZuntb7cmRWKzVbYIkoSFly0o9Afq1wGjLci1Anhlj1hfj4p/7OT/fXpy06ZOmLA== 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=rFaaCn+LweXwfCLkz9lZ0JmO2TYwkPBbrMhpBnPl//Y=; b=p/8fXDzHmhXOAh4SAV3IpQsMGwjgjixyevnMTgjWrRXwzzB2AHz1bpNrYHa6ii/FuSUmUsqwey2+5j1BK4SeSHInQaXn/3bstFXEAA7CR6BSh9ZelLFOXZbp17OIkymKDEmhn98aBiCbF6UvB6cQbO8TdhrSYhmKthdmZtPapagKGNoEcLXo7DxWuZxcIcFeWdLtgRhDVyXPSlBOsKpcIKsSZ7ZbzIHfh6ee5XndG9EqBgefZQnbaYD8nvobtz13+6G+tbWwwo8iIY3wfHXH79NqgxJno3vt6INTdGZdXC3Mo+3PD6xyDC//LKxR1ECkbs/00S1IRJp1MzJYyeuylA== 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 PAXPR04MB8896.eurprd04.prod.outlook.com (2603:10a6:102:20f::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7002.17; Tue, 14 Nov 2023 10:24: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%7]) with mapi id 15.20.7002.014; Tue, 14 Nov 2023 10:24:30 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v3 25/33] selftests: mptcp: export TEST_NAME/COUNT to mptcp_lib Date: Tue, 14 Nov 2023 18:21:55 +0800 Message-Id: <007081e3971c8dcc03728f48647aef2c59cca4b5.1699956980.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI2P153CA0012.APCP153.PROD.OUTLOOK.COM (2603:1096:4:140::15) 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_|PAXPR04MB8896:EE_ X-MS-Office365-Filtering-Correlation-Id: 6d566475-bcba-4f75-0b4d-08dbe4fbe26d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: pWuTyjV+LhGBhMeH2ef96XOJ8ujEZJaH5TlUOT2TylaLp+fF5UEoVLGyaChrPlYkaHLOMNoPJSDCzZJAINZjageE2bgudJP2ZACcd/pN0RGbULwhdqDLGViVikQtl9Ve1tE76d+b5ZdF336H8KZZ0tDiYy+H1Xl/gSZf2g87NH3A5oeBKb3ainayRJExytB3qfPiqXWuvCLtLnfvBMd1P64TsHb9A25NthZTZa3XNgXDUuD5p2X257YBfClSgTamaw6iP+kLCycQPNfAAE4RER/58h8fUGGnQ01LmusnqPy8uC44qTCu5VKRYuB92vX6J8XdWH7JAWaf0snlGsyCOZkhmcdTrFbu7C87qdpqvl4wUXfjReu+nZInnHKsk+eRgnGb0dAHTUZ8XQt4pqB77YZGhz5bLIwCGVB01Nl1emW1dkMrTDby7cMNHPsbVQiysxkfEaHXn4cUvYDpy0a3KtK7r8TJWLUi5dW0fS7K6etW5ci0NPjQuZsV1OE9EZtF6YnEIZfOySqRYi2qkgRa4LC67asI2Ua5IYERS1ffnnvLswfoy2NdGlRd8wnjH4yw 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)(376002)(346002)(396003)(39860400002)(366004)(230922051799003)(1800799009)(451199024)(64100799003)(186009)(316002)(6916009)(66476007)(66556008)(66946007)(478600001)(6486002)(38100700002)(44832011)(6512007)(2616005)(5660300002)(6666004)(6506007)(4326008)(8676002)(8936002)(26005)(107886003)(2906002)(83380400001)(41300700001)(86362001)(36756003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?9rIMK9EyzJFeTM74uXheB9IArX3otSA69McI0CeauamdCP19QiNCSt2iNuKV?= =?us-ascii?Q?6fuCc+773Go6dx1KoJPYcss0Qdf0BE4RYL1/qWiot3zjbcMWdz6M+I+OBCy0?= =?us-ascii?Q?omHxwlA/xciaB+a1GF/C4wn2R9mKknxwJ5b5j5KmcAXlCD+Ny4K9M0SCVUFU?= =?us-ascii?Q?WxwA6rQk1nEzVdeyJrw5GmSZcsgbbekO0n6MKTvycOv/UasfnwwGz2Tsa9YS?= =?us-ascii?Q?vSzvY2TpchEviADKMHtSgNQlf3Ynw7QG4GYwAYPTqlzGBen+w6rswFC7jU40?= =?us-ascii?Q?wVqnr8ubKJtZ2pE3+mgC2HMfzqwxTwmT4XAKiNBAC49WnKazul0CS9nkw5Ml?= =?us-ascii?Q?CA7vIqdBN9dqt4patIjf9n4LUX3D64k3IQ1FD6NcwF2xQ8nXwGLrvjTnPfiZ?= =?us-ascii?Q?QVdpbPC+QBxHQ9xLm43012HxUxQTc+y6lmxJAGI0+7uM5afLjirLjSdW9dyf?= =?us-ascii?Q?lpqfKC59bnsjgaRzGebpsjajC8ZHLz0dMRo2MKHoWopBg/Se351sKR3bTu8X?= =?us-ascii?Q?lRFkU0Gbg3XiPfECyoi6m2TK5vt7of38ebf85X5IHvHtf6I9fFDQFFaHFD/k?= =?us-ascii?Q?7nr+EMyiw3xnBgottmBu+UR6QenQHW2y/4t3RGAzaDAazSNslKPcq0Qzz6JC?= =?us-ascii?Q?IQY62LURZyDjFZ6q3QupC7uaVpIgy5JPW1iciuPcBVmr/dhoMfS3jX7xEXsd?= =?us-ascii?Q?6s1LxXE1LjEsMNGBB+J9yY+h/jqHZ5o9Usdm+UYuV2lORy57zE+yb4Wk/FBh?= =?us-ascii?Q?FcCIXJfV70WvfdOsmiEcpSTZ+L0aqNfYwkrjn0FmfjlpgVnOr9RTv03hkAkc?= =?us-ascii?Q?Xp4e3hqj5KMPPVGBJA6UmzA0KKXm50kJDXYsvWgQMMGUEYqj+NqtflmnL8yw?= =?us-ascii?Q?fiOCYSxYKxYmVZbA9UttzHAQBYKxIMWhywQ/uJxaV0SIWm/uq7D/d08ZAvlY?= =?us-ascii?Q?/tLhHNuYs2pnr2kG85mNOyg2dPVcw3SXk1YFBi3op4MhFE3N+zHP+/adGD5F?= =?us-ascii?Q?EqzQyc0nvfSFUUkH70iadZOemMsx1HlaRvaJW2usOyA+deF1cQFL7aDkysBK?= =?us-ascii?Q?IUP0H5KmFlWFCSKmcZcyBiXJdy5USwlZVeF9SYxMfVIWJxErgg+PMVJee37j?= =?us-ascii?Q?t238FGShm03qHqhi2UZaxDun26I3sG3k8jcGJAYQxnGPhb/tIQQqA93FfbNm?= =?us-ascii?Q?1AK2r2+1EOvfyq9UbAHaa0rw1J6JPnNKj0u/Nk0lar8Uv4FkxTK+SXtOjvXH?= =?us-ascii?Q?5wKe5Vg5tNK40JRlsUlN8bubgyckTL+AX0K2t6ETxMyltzlUL+s7hCUHZ3LW?= =?us-ascii?Q?+x4yGB+8PBK/JzUig7Mqc5E5ktCN4EOjoCB2ejcJ8yVZhZKhAz6eslhvooNh?= =?us-ascii?Q?x+QRTmhSyZf3GvV0dexBSAnMglvrvQbPtrQrqB5zvCJnNZ8llMSDRn1MZ72K?= =?us-ascii?Q?Ek1GxB/vjQychgmkF5tKsYn6+R63T1Zh/XnKybOHIoVvS6KN82nreJW2nAnK?= =?us-ascii?Q?Bgm+gKoW98EaK1E3izvV15yAGHL2OZQPw60jc5GZd/GP/i8rBAcVSb4u/mxM?= =?us-ascii?Q?5Vp1UKQ4hCJm5iO0J+atR18hgNHke9oLHTXvRy/dckZesjBnYF/UPdnlXc7n?= =?us-ascii?Q?nw=3D=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6d566475-bcba-4f75-0b4d-08dbe4fbe26d X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Nov 2023 10:24:30.2755 (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: PW++f49m0kuEqLjcS3nntt0DeAHAPMWEV8NfRL7hFq5UqTj059Zx+O+t4/wspvYJyrKWZJLpitFSIrPXXHXdHA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR04MB8896 Content-Type: text/plain; charset="utf-8" Move the variables 'TEST_NAME' and 'TEST_COUNT' into mptcp_lib.sh as public variables. Signed-off-by: Geliang Tang --- tools/testing/selftests/net/mptcp/diag.sh | 1 - tools/testing/selftests/net/mptcp/mptcp_connect.sh | 1 - tools/testing/selftests/net/mptcp/mptcp_join.sh | 2 -- tools/testing/selftests/net/mptcp/mptcp_lib.sh | 3 +++ tools/testing/selftests/net/mptcp/simult_flows.sh | 1 - tools/testing/selftests/net/mptcp/userspace_pm.sh | 2 -- 6 files changed, 3 insertions(+), 7 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/diag.sh b/tools/testing/self= tests/net/mptcp/diag.sh index 4279bb59939d..c7a7c0d2792c 100755 --- a/tools/testing/selftests/net/mptcp/diag.sh +++ b/tools/testing/selftests/net/mptcp/diag.sh @@ -5,7 +5,6 @@ =20 mptcp_lib_ns_init ksft_skip=3D4 -TEST_COUNT=3D0 timeout_poll=3D100 timeout_test=3D$((timeout_poll * 2 + 1)) =20 diff --git a/tools/testing/selftests/net/mptcp/mptcp_connect.sh b/tools/tes= ting/selftests/net/mptcp/mptcp_connect.sh index 7442bb2a8562..54ad82ed8c91 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_connect.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_connect.sh @@ -123,7 +123,6 @@ done =20 mptcp_lib_ns_init =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 52a4080b32d9..bf2f73209cdc 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -40,8 +40,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 0498e3758b9a..cc65d9e25481 100644 --- a/tools/testing/selftests/net/mptcp/mptcp_lib.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_lib.sh @@ -20,6 +20,9 @@ MPTCP_LIB_LISTENER_CLOSED=3D16 #MPTCP_EVENT_LISTENER_CLO= SED readonly AF_INET=3D2 readonly AF_INET6=3D10 =20 +TEST_NAME=3D"" +TEST_COUNT=3D0 + 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/simult_flows.sh b/tools/test= ing/selftests/net/mptcp/simult_flows.sh index a9e14698c179..e1f4ddf04bc3 100755 --- a/tools/testing/selftests/net/mptcp/simult_flows.sh +++ b/tools/testing/selftests/net/mptcp/simult_flows.sh @@ -8,7 +8,6 @@ capture=3Dfalse ksft_skip=3D4 timeout_poll=3D30 timeout_test=3D$((timeout_poll * 2 + 1)) -TEST_COUNT=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 b25456fad2f7..7a45abb789b6 100755 --- a/tools/testing/selftests/net/mptcp/userspace_pm.sh +++ b/tools/testing/selftests/net/mptcp/userspace_pm.sh @@ -41,8 +41,6 @@ client_addr_id=3D${RANDOM:0:2} server_addr_id=3D${RANDOM:0:2} =20 mptcp_lib_ns_init -TEST_NAME=3D"" -TEST_COUNT=3D0 =20 _printf() { stdbuf -o0 -e0 printf "${@}" --=20 2.35.3 From nobody Sat May 18 12:05:10 2024 Received: from EUR03-DBA-obe.outbound.protection.outlook.com (mail-dbaeur03on2062.outbound.protection.outlook.com [40.107.104.62]) (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 9B94C18C1E for ; Tue, 14 Nov 2023 10:24:41 +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="arh616jq" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=RhQSYekje1o6iMFObaug0bWW0DSxPX8K2crpKVOe9pLhQkmXbFtrjuUfYR5oLL8u+4eeB0jz74XhWjZky/9Vf8YOgyoXksKJHzArLffOW5jO+9ylB4PsQfufETaJbES9vUwF14l0tkrJkznWcQHTHihOuWU7PZs1TDBu9wB5LLukX5jcepIbCNTsQul/7hfkVARQyY+H+06uLV/bPQhbBQV9tvwSEebZI+dT08N+q3Jnd0uB1WYsx2ANcYJwc/Ajz6OumdJ4fSRwSwXC5Oig6hfw2bLRUvVbKlWMoe9j52J2upuk4AcrnC1P5SvQfeglywSWVo8l92A6I7SefDYzCQ== 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=fnrbHek0IzYTAneu92fpPXnq2J8mQLj2jvDJNMUCwJE=; b=Xj2JJ/2Yr22YwU+IvUL4jXoI6BZ5FxJjVtoaFUjN5Xu3r7eXh6JgTJ62z493pjhbLEyXwmNYMtdwaCPikvVXzeV5azTo4idVKtLpHOA0hZY3IqtD730B4/na7LilT1AhIuCh5PFH/V13tLpHWzPKIiJZBDOaR+6miBUt8cM9hDMqOvLU5cuIiryN7PtEmSHcLCtdcmz7L4LTlRLT6Fv0a8lgfp7tczlo+CaMo/f5CpB0D+CIZPdVP5+1kpfGj3jQB6R2uvLjRBISm9K9TgdeTs4ZHkoCxS7DKXd5ShjbjckVz85h16R1y+zVmJ0Yu28d9gn74sMjkcyyj5rjGQ2raQ== 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=fnrbHek0IzYTAneu92fpPXnq2J8mQLj2jvDJNMUCwJE=; b=arh616jq9IfU3JWeYaQjAAfN+Y3nJtZvo4GSSMVYK9wP+xV4wHAI0NCll0Ehf/UKCHrHfwE/mw9v8ElQo247i3LtogWeIl2PWDlF1plNf32T0ly9aw3CJJpb150QH6ESgDBF8WHYAu0IN0A1DmfVm0cH0sWEj2CXSz+va0x4MZasIHikrsLm07udv3E3AptP9IurpRPBy31sb4OkubkJbRlzQOsg1UNVo3PXdJw2ths43U3YAXQiDvkm4QIBF+fS072f3mFbgKtOWqYjCUDDb3I19qkKPk09X0GZ/9uzUfqdoAftPG16LGhrevZ0hXCutr/3sLKYX3X7S3lrtcdnYQ== 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 PAXPR04MB8896.eurprd04.prod.outlook.com (2603:10a6:102:20f::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7002.17; Tue, 14 Nov 2023 10:24:39 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::7102:259:f268:5321]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::7102:259:f268:5321%7]) with mapi id 15.20.7002.014; Tue, 14 Nov 2023 10:24:39 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v3 26/33] selftests: mptcp: simult flows: define missing vars Date: Tue, 14 Nov 2023 18:21:56 +0800 Message-Id: <32ea92e19df2632d50fc13e4dc7041cda3435258.1699956980.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI2P153CA0017.APCP153.PROD.OUTLOOK.COM (2603:1096:4:140::10) 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_|PAXPR04MB8896:EE_ X-MS-Office365-Filtering-Correlation-Id: 5cc0caeb-2aa7-4bac-5dbb-08dbe4fbe6d2 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Zo4sb7UjAaf0Grnc/U1xd/cpoDf2+1CsWBdRuMfyW17SXg92Wa/g7TMhx66dEC5O/E2vlBvSt7MjwAUKfFfxgtACz2KiYK4SGT5nPDNXltTMLsIIpUtd7JFhJqfUJMSHE6bl2F/Fh+Rj2Pdh0IMh9fWqyobb7UXj8cYmjbWKoijvdMPbvUMUvB9Da9mnx9JQVf5O+g87RPCBQKWWbNhi7Wmhla41NlFp9HEkcTccKWsEDuZ20qRYJ3nGkqtViSQ3BQu9kxlMtSlnBGO1LdYHxqQPxmQpE4xK89NADAkuEHUekWgmH7ZgCogJ9kVlshCYHvlzMPFc6SMj4GurHrEs6yQxjlu9tRdvtdUzlDHVwCr25Fw2doJ8MtQkb+HC9jJ7apCG4mvkfWaIQX1LqovGjyWEb+Hbh5vaaLjeBFb0WRB3CMC8Mz6w4zjQfFcu0QO6i4TxpYoZzbv0XmyQLzDmJ8IajUVh51BPyhyOeVTBuRow3atYpUsUV8QYThtBjwgr8rhSHNZDjqKI73W0T9zxeY+535wjK+OziqwT75sDAfH4Tlh7fEAvA5JlGXhQh+F9 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)(376002)(346002)(396003)(39860400002)(366004)(230922051799003)(1800799009)(451199024)(64100799003)(186009)(316002)(6916009)(66476007)(66556008)(66946007)(478600001)(6486002)(38100700002)(44832011)(6512007)(2616005)(5660300002)(6666004)(6506007)(4326008)(8676002)(8936002)(26005)(4744005)(107886003)(2906002)(41300700001)(86362001)(36756003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?5P8lmdVy+fGV4D9Pe90FpLyYVpXauQ7tRqfmEiwh7yO0GqKrdfzdOzo8fzoH?= =?us-ascii?Q?OCxw3GsPNI90xAf6BZW+gUnMX/Smuj0omvw0/kjeQb+PeHufkzibNo+LbrUx?= =?us-ascii?Q?WLsl8oJK4ZAjPY0mCCMXoV4NNX87H+uGrjnKybniYx7wEB49yuXv7ZbRZNHe?= =?us-ascii?Q?HflFWNR6qrc8ZNL4jcRRtmvQSEg5Toce6Zkd5TS3eVY7eC92RbDWprUpumPW?= =?us-ascii?Q?fM0VEg24mDmVKx85JWPoQTb/Cp16kVqRD+Lmw9QQE6KRZjH1mtYc3RlMFn62?= =?us-ascii?Q?no4VLetdpaaFxrS2L+12sRy+kwClVb/Nh2iuPDUISDp7dK64uTH1TP+h3DdV?= =?us-ascii?Q?PuowNJS5RM7BQWkGeJlWFruKlgoSsPrHEmYizwvEM+1O2SR4PUXPZG5Unb2Y?= =?us-ascii?Q?TqCsV/mAxCe2PNURLx0I8g2hwJtxvw0G50AUkbhmMQ2izK/YL11LSsp6WlCB?= =?us-ascii?Q?Q82au4DZIzsVS+kMbjFklF8qHWYfrjp75vn/3qsAdjhmKLZuStKOXwn3+i9R?= =?us-ascii?Q?EGf/ag81VajUmjvT8Et3a2QV7Vmi7QGJisFv9JG9LrZxSu8mgiE+bRgmT213?= =?us-ascii?Q?QF8JX6xuQvZwqTfyMmoKnXyy0pCAdpqv1npwsvbfcefzOp6jrXVOVZXZqlYC?= =?us-ascii?Q?d/LzIXFlJfo4HpZZ95D/IRbHb5doNN0Sl1c6KjImTvUbrZzEQCslCC8U8Zf2?= =?us-ascii?Q?9pdeNfYzkZbDuyz7fIeQZgkhFwn9pmTLmHMVRyomHpcFyyumfnDPN/yM0axI?= =?us-ascii?Q?fm+gdx53fUiPWABcdaXrHvXPjMV/HayknJQy9CTVi7QwmQu8Sw9Ftva16cZK?= =?us-ascii?Q?0pF4JL8y0RcCr+q75XXw8lJa1OgRg7PHVE0K2UUSrl5oauOhn5ikOC38B2vE?= =?us-ascii?Q?gHTM0F3BtxFtGeF0sRVO8agiDMT3/Z/DPfWFCL68yo+nvSJi+yLMZsosNQ8F?= =?us-ascii?Q?tUdttic3DY7FK7zZFzRwvwfi/XsnFSdBr3zkDU9fIYk/hBfxCkG4FKB1ptks?= =?us-ascii?Q?FKwNX0Puoa5YZYCUOnBEjavaHVFlDbiF85GFHv31tlXjMDHYI75XT1+t+FtH?= =?us-ascii?Q?jJGLzDqX2KPAVof+eBC9k8sVtoQgSwauAy25EaVq5dz8KiWo3+yitpCT3PKm?= =?us-ascii?Q?p4u6mPszdZOBF17g3vWAMsMPWSw4kgKCWLQ7jLWmSgCkjZKCgLoYNV5VaVl9?= =?us-ascii?Q?EEYQHXw2YO4UznFVkx/4qr9M0ATTasSzO/jqHU6ykc+BkZ4GUtnABEJwPxfP?= =?us-ascii?Q?jy8Drb/uA0Ko9+EKM04ivUgSuxXVvmla6buXivHw0fmdg70RvZGeG/nTndaG?= =?us-ascii?Q?v0Eezhu2+MTce75CFdz6HTd5v5z2vNm/f2D9fc/Od4L6rAIVLpA+AS6Tb48j?= =?us-ascii?Q?bBHKPcRT+Ae8OIWUX4c+3eBgLCWEmB5orATO+bjIlOOgfZRalJikeOa7ptKm?= =?us-ascii?Q?uOG1IddVywGkWyyA2aqVuK26GLCcUFTrEHdoHYts+iwbCt/RqAKlWVphypTU?= =?us-ascii?Q?3jFUEK+ZY/7Yi9b60vhCePg5OxuRnSN1eeaMCzQto/EfQb1Ga8F/CKUFLCb9?= =?us-ascii?Q?RKSzW961Odd8n05hjHDPwnAo86+8Iakfznu/sTnKK8fSI9eWwQCyLHNs5qyg?= =?us-ascii?Q?uw=3D=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5cc0caeb-2aa7-4bac-5dbb-08dbe4fbe6d2 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Nov 2023 10:24:39.2108 (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: hIbjGS4UyrqNcvG6T1QGeifjWi3KZC8IKKFNhz3llnQ3Wcxw7i43Q/UGbMbeCeUJbbRc7BxtsTKDrBSwj/1fww== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR04MB8896 Content-Type: text/plain; charset="utf-8" The variables 'large', 'small', 'sout', 'cout', 'capout' and 'size' are used in multiple functions, so they should be defined as global variables. This patch redefines them at the beginning of simult_flows.sh. Signed-off-by: Geliang Tang --- tools/testing/selftests/net/mptcp/simult_flows.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tools/testing/selftests/net/mptcp/simult_flows.sh b/tools/test= ing/selftests/net/mptcp/simult_flows.sh index e1f4ddf04bc3..a85c9ff21e54 100755 --- a/tools/testing/selftests/net/mptcp/simult_flows.sh +++ b/tools/testing/selftests/net/mptcp/simult_flows.sh @@ -10,6 +10,12 @@ timeout_poll=3D30 timeout_test=3D$((timeout_poll * 2 + 1)) bail=3D0 slack=3D50 +large=3D"" +small=3D"" +sout=3D"" +cout=3D"" +capout=3D"" +size=3D0 =20 usage() { echo "Usage: $0 [ -b ] [ -c ] [ -d ]" --=20 2.35.3 From nobody Sat May 18 12:05:10 2024 Received: from EUR03-DBA-obe.outbound.protection.outlook.com (mail-dbaeur03on2050.outbound.protection.outlook.com [40.107.104.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 1D2A418C1E for ; Tue, 14 Nov 2023 10:24:48 +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="X5cozB7T" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mn2Q2UZhr2fqlVWywB06DUwzeCUQszIT286eTcvFoESPHuLkG4UPKDr+IkFdNYAOd2qdxWcbF7H38Oo4VPsEE7gPFqzoXjt5dmo2z+V9JK69GuJff54g4FPxWrafWBJkP9H73rvIhUqYx9QSPKdhAO8lQprgXcgVtHNlG+qqN6Z9miXTW27KL10aR6udRnqiSx/+dSioroxU+n+f9ZUoo3UHTlkvIm6OL0Nk1FyOkGDZOG2kamdVHxTPrd0YCt2/Gm9XDTca0RxgrgE5Et2Xy3wj0ouyv0ZK8/ADxkKsNHv8DDNRK4QsIcmAFiwgjiLmrzYHWA+FUIEIomsdmYEqlQ== 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=z0MV/hMW++ZifaIqWy4+PBEFuFwuoWJC31Lza2GJ7+I=; b=bf2I4CQudyDq57hn+jpbatg9p3l/xRCExdPylsR7s8NUhbhRX2Lrt+zgTdQ8SZOYfX3Eqlurgnh1FJVO4OhWuN4uxT9RGkdUoCQtbwbHF9llnuwE7ng4XpxT20i+VGmdlQzsQlKMlmIJZMmfL7WerEWRdVFSahBBWHqi3wwG7Gt2uitNGmO70BrRgWPyFTmRMjlMhhz4Png98slobh1vkiIrjGkD3TOhMf8crJGkbZEQ0UV93HYkaGOnqfQM6UR/Rrz132e2KfkvWy9s9LOcroadIHOeJ3RIgpfwv1zMbBUtwIlt9Wr2UlbaL7Invx+Fg6V/I6n/CKQ4cTXC+p5ZgQ== 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=z0MV/hMW++ZifaIqWy4+PBEFuFwuoWJC31Lza2GJ7+I=; b=X5cozB7TPX3AbGogSU/ceDe1i4PaaYRGnxSBagVSuR4eGyJjwtO1iR1Jm/moYEPLFXYeCDQZOc+gzAeylPVvffbHG+9Zp48AyV4t2QKdCFR6LvT4FP4R/RUljdKJj0MNc/a1SEn8Gu1Yopl6si5VwyWIWM1t/t1q2yf3VoJO922/ikyJScK/QjL+qQ3zX27MMTljqQfgMclraMXhdOFaTRoSfaM3jGOdb0B1pNO2YNqu5X8QJsGyI6NPJQ1de3rQMXJTfUzl4881k8CszY9an5VL1so4/zsXUcjr0dbxVc4simT/kxJKRfG8TbTbgvAUVPMfSlTKIfuQHV78drtX5Q== 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 PAXPR04MB8896.eurprd04.prod.outlook.com (2603:10a6:102:20f::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7002.17; Tue, 14 Nov 2023 10:24:46 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::7102:259:f268:5321]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::7102:259:f268:5321%7]) with mapi id 15.20.7002.014; Tue, 14 Nov 2023 10:24:46 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v3 27/33] selftests: mptcp: export cin/cout/sin/sout vars Date: Tue, 14 Nov 2023 18:21:57 +0800 Message-Id: X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TYCP286CA0173.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:3c6::16) 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_|PAXPR04MB8896:EE_ X-MS-Office365-Filtering-Correlation-Id: f44963dd-0b71-40b5-7568-08dbe4fbecc3 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: XKGurtGyGb+f+3q/s6SwMazkJxhr4wndvdPmRo5rxMkdHib0qn7SHeuWEtVYj4LHj3iHWxmjeIfl5KDPovi+RXSKhgiOYX8lXOa6ciqtR0VaqKiwmHzMiswcNXXpDCFgsCFLHy0JBg+8SjSNaT9C8YZ21lm7JnpBArbZeGstvU+bgC21Q8qDSde5JRcSRKuTNyhrvBKDNT30OUsVBi/Z1NQvaV6cVexvLFM/aWudcIQdr1GjJF5cLVemE4yO47ecQ+jzpOs5uvqg/XfrqueAum1wWD3Qb4NOd94bI0sfkSQbujU4EgCwy0/T4pQUp+Iug899vF0l3IQbdfIZd2Rv4IvRBPirPVCWVZMtyX6CIPynbInEOB14UK4MJpnhY4AkwyP76e+vX3vNtDSxRfH2uohlI3AecVRexgoV5SKkxVHcvF5H8t76+sAzSoFqktQnq3kDYukFzQl9lZP/Z/maLlkiCe7QBvC5RncjzdQQ7Q7gu4T9FAOR/dorn1ssA6NY1NCyBb0+ALnmGz7EfPIJYVQTGW57SMOB9k0xT2LtjakWz/F71eGgYGRtMacgh4uw 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)(376002)(346002)(396003)(39860400002)(366004)(230922051799003)(1800799009)(451199024)(64100799003)(186009)(316002)(6916009)(66476007)(66556008)(66946007)(478600001)(6486002)(38100700002)(44832011)(6512007)(2616005)(5660300002)(6666004)(6506007)(4326008)(8676002)(8936002)(26005)(107886003)(2906002)(83380400001)(41300700001)(86362001)(36756003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?HJCtJSFc4XyZYH9Tw2OaDzFQE51lXXhf80ujxhemgiFPaMcpl65Nkb2hd3D5?= =?us-ascii?Q?wL88jlxuHjDAEiA25eu1Zm9L2+dKdkFXDTq+FGL6vtNi9PnhiqTted5Mu+xM?= =?us-ascii?Q?YErhr9AbMdWVOknDM7IvzIc1tHI6M+4KB6vR955m30itHs2nrLoQmPSdBJjr?= =?us-ascii?Q?019J/KH9FZj0QL7v4jxESvVqb2/mAdmsZ5xrTm/0f209Q4IVnoSiOFkBxZBd?= =?us-ascii?Q?sDUmkTRpJNeRmEIIjWGYr0oaA/GlbslFa8nKibF9R18/P6KdAf0ot6ejs36s?= =?us-ascii?Q?J6hy+vXGLZQRNXxGgS7xqAngu4GBlZnsEIHkJqjo2k6sY44gURFadp+wMd79?= =?us-ascii?Q?2IxXnMESet8eoHc8z26BYr4GQPQhJnJe7lQxAsMwqGhv1u3FWE1AfoibkcpV?= =?us-ascii?Q?JN3sjOJkvMjGqARRr+ZKdqwZHXSLDLHmDaaTtV64Pu56GNzb/wCiKjnxd99v?= =?us-ascii?Q?PdNWSrXW09trjQDCIZQjv2f1pirzKe4CSwfUmBNOBgT6egKV5TB4lZsdPfJN?= =?us-ascii?Q?hAAVCtuQNRq3D33aB/3mthc4lgemetut4iyJC5pESTHt83yaVr69zN1Hckk3?= =?us-ascii?Q?zT7fyOvzb+Wo+UjE7+mxRYZPdJTHg8hy74F4z2b4plKNhHPGR6IBrGz2MMlX?= =?us-ascii?Q?y19PfTC6khwF32l3XfrYk9KsXVRlja5/Tr87C7xhTboy0VWeUwWTU61p+9wX?= =?us-ascii?Q?qckV5LKbrBGkgDN3lCu8OmlRE02ZNCAwjLsMuf5GwN/3MyN9eYP0VpggwUxd?= =?us-ascii?Q?zjCit3gNZiE4rIvzqIieY6oViSlMDfE2+yB8o8Z+ppKZMl0JSa4fAiP9iNfG?= =?us-ascii?Q?nAljCmx4x42rkHCvTQXQCSxYjn7QIQQWU8DMu/ggj1lFIg+s/4jxN/kwW2Aq?= =?us-ascii?Q?CxF+QzXOV8w4werQJIZF1cYu77uz0HqRUT+3jyY6V2TpdNTDuSgv8VDjLY2/?= =?us-ascii?Q?gBTTTFSp1z3KjWN/KqighRG/DIP6hmZ7TmhkP9puQLInP7ugzdeTMDlt0nRq?= =?us-ascii?Q?VgCxQSgg2Z8pH2eiaeD1zrL0Lejrl0Cf9Tq9UMCtkQlPb/zSEazgkl/V3nBf?= =?us-ascii?Q?nvQn/OyaFg4LpuEMLEYadLkGef21WuF3vMCdloRXFtuxod+ueFJ4SMC1GgVh?= =?us-ascii?Q?upNDZgRfPx/EhehEmGuOnmgxrCvjrYwXl++2zjCuAAZiIpN/aokv40XteR45?= =?us-ascii?Q?YrtEymlOY/GKFk5vzESRoRAEtHQ4UM54IILftX63ysVEnGAcotYoBRHpuzMj?= =?us-ascii?Q?yCSdIS6kqEy7kyW+MnzZ6Y+fcH96byPENlreauhiukRPoaWEEVlF6E8s2SPb?= =?us-ascii?Q?ermOrUSTLoU/tfaDepVeFrBkIg81jdeQ9ximpQebysy4SYpP+wwT00K2wPJU?= =?us-ascii?Q?EsMRJ/6xBxnzSFHOiALeaN56X6dj2ouO0vuzHefdZbc9bD0oZQ5MTnVfNHv4?= =?us-ascii?Q?AgYWw1Tb1x350CUNUNJcMzJlXCm4db8z9NNZMOC/lOeVbLUNDfw3Lfrrs8VK?= =?us-ascii?Q?0f3a24V9E7CabK595YG1x09yNhrbtuv2ZLtEdvwhOt0xteq2G4TSCaYVTiZM?= =?us-ascii?Q?vFjCxdr2FFjZaUadHdYnrOUQPgUiQmuFGwOvPY/P?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: f44963dd-0b71-40b5-7568-08dbe4fbecc3 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Nov 2023 10:24:46.6710 (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: k0s2mXeNrWvM8F8j7UH930w0joTxxr5oTi1Q2368Iv9N7kD8zbUHJjuzAYTIQGBbqzlSbKq4GVCeandDwm4pyg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR04MB8896 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 scripts unified. Signed-off-by: Geliang Tang --- tools/testing/selftests/net/mptcp/mptcp_connect.sh | 10 ---------- tools/testing/selftests/net/mptcp/mptcp_join.sh | 12 ++---------- tools/testing/selftests/net/mptcp/mptcp_lib.sh | 6 ++++++ tools/testing/selftests/net/mptcp/mptcp_sockopt.sh | 10 ---------- tools/testing/selftests/net/mptcp/simult_flows.sh | 5 ----- 5 files changed, 8 insertions(+), 35 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_connect.sh b/tools/tes= ting/selftests/net/mptcp/mptcp_connect.sh index 54ad82ed8c91..a2511a37d9ce 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_connect.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_connect.sh @@ -7,11 +7,7 @@ time_start=3D$(date +%s) =20 optstring=3D"S:R:d:e:l:r:h4cm:f:tC" final_ret=3D0 -sin=3D"" -sout=3D"" cin_disconnect=3D"" -cin=3D"" -cout=3D"" ksft_skip=3D4 capture=3Dfalse timeout_poll=3D30 @@ -128,8 +124,6 @@ TEST_GROUP=3D"" cleanup() { rm -f "$cin_disconnect" "$cout_disconnect" - rm -f "$cin" "$cout" - rm -f "$sin" "$sout" rm -f "$capout" =20 mptcp_lib_ns_exit @@ -145,10 +139,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 bf2f73209cdc..c2f78c849da8 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -12,14 +12,10 @@ =20 . "$(dirname "${0}")/mptcp_lib.sh" =20 -sin=3D"" sinfail=3D"" -sout=3D"" -cin=3D"" cinfail=3D"" cinsent=3D"" tmpfile=3D"" -cout=3D"" capout=3D"" ksft_skip=3D4 iptables=3D"iptables" @@ -155,11 +151,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 @@ -170,8 +162,8 @@ init() { =20 cleanup() { - rm -f "$cin" "$cout" "$sinfail" - rm -f "$sin" "$sout" "$cinsent" "$cinfail" + rm -f "$sinfail" + rm -f "$cinsent" "$cinfail" rm -f "$tmpfile" mptcp_lib_evts_remove cleanup_partial diff --git a/tools/testing/selftests/net/mptcp/mptcp_lib.sh b/tools/testing= /selftests/net/mptcp/mptcp_lib.sh index cc65d9e25481..1d7f69d36b4e 100644 --- a/tools/testing/selftests/net/mptcp/mptcp_lib.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_lib.sh @@ -25,6 +25,11 @@ TEST_COUNT=3D0 =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 @@ -509,4 +514,5 @@ mptcp_lib_cleanup() { echo "cleanup" rm -f $mptcp_lib_err + rm -f "$sin" "$sout" "$cin" "$cout" } diff --git a/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh b/tools/tes= ting/selftests/net/mptcp/mptcp_sockopt.sh index 2aff01813058..8640dea7abca 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh @@ -3,10 +3,6 @@ =20 . "$(dirname "${0}")/mptcp_lib.sh" =20 -sin=3D"" -sout=3D"" -cin=3D"" -cout=3D"" ksft_skip=3D4 timeout_poll=3D30 timeout_test=3D$((timeout_poll * 2 + 1)) @@ -71,8 +67,6 @@ init() cleanup() { mptcp_lib_ns_exit - rm -f "$cin" "$cout" - rm -f "$sin" "$sout" mptcp_lib_cleanup } =20 @@ -329,10 +323,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 a85c9ff21e54..de897b226d40 100755 --- a/tools/testing/selftests/net/mptcp/simult_flows.sh +++ b/tools/testing/selftests/net/mptcp/simult_flows.sh @@ -12,8 +12,6 @@ bail=3D0 slack=3D50 large=3D"" small=3D"" -sout=3D"" -cout=3D"" capout=3D"" size=3D0 =20 @@ -26,7 +24,6 @@ usage() { =20 cleanup() { - rm -f "$cout" "$sout" rm -f "$large" "$small" rm -f "$capout" =20 @@ -52,8 +49,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 12:05:10 2024 Received: from EUR03-DBA-obe.outbound.protection.outlook.com (mail-dbaeur03on2042.outbound.protection.outlook.com [40.107.104.42]) (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 EA1A115AF6 for ; Tue, 14 Nov 2023 10:24:56 +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="SH0VpZ7J" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=OxJmrBZ/gogt4ugaRsQrsiIhSpNT4KxMTYoxlYhybHtSWSxJZ+SKtgqoHtTx5pAaTghmjf27sv6eoU3Dfcy8hNtRv+YnwWHBrc4tVC4ogpl0r/Xdmq01WIJczMBgwMgtWNvMfUOXW2KlYVL4bgNhoKHIw2QRxF+5N2SiwNDfe3NM3ufCVDMJoFcm5YOAXMm8HAlGcTXCwXe+8uq5BiMPB8/NnQoFElsjYY9fngs+RSPp/XlbQi0yLNlVs+RyYHtYK2gfuhZEx0uuzkWiMBmQvPOToE2Vp7cGjYM8E5YlDmjfU57i60pqAWBW4tj2CStFFGSkaJGI9Fo2vY1F62vkAA== 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=rJn+ehcXzJm3YDiWrkeNlPMTyKXa3RMkAHKz6/o/qTc=; b=ZL7zM1aumFEAD+Uk5nrtXOQC5O+aIPQj5J1OsvY1xmAR2COWS0tEV1bYN0Qwxf1SWuuwDyXUihN9ZoBQvs0BdymLWXooRxjBaSkryzPPfOPYuYZt35/M0GcXb7gdFYhknbKJ/1kotnpaFY+RyOwcjckdMAelfwtGUhbqoThWbhFDw/QxqmJEFsibn82Fhb/i8QO31A9X2CK4IgbZAgu0Cq8ZKuP7zeUJ4WVSHFARg0tEWgzMOhr1DCLfFbP2WKXFm5vkcEAU6HhHRXdquzR6/TUAyS+NIawD9RVPODzuSrbQ6wVadeDuXb+i9KV6erXAxi8VfXxuVf/9bJybYCCvEw== 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=rJn+ehcXzJm3YDiWrkeNlPMTyKXa3RMkAHKz6/o/qTc=; b=SH0VpZ7JPAvEF60wPFv85X6ahI2QxFrVH9WBOSFx1XTeBsGhLzHaOYEI5llwTizN9Q/r6uRTGttkD5UfWSLSirE5z7Xxh0llsyZRO2VdPkn6D5JtKuvE1GA7dWJHfNM+QqtPUdwa58eGmLvcGjWti+b4WQ4R9A3i11DZeJWx3wYlQ832Owrz5+CLndS9pNenPgQ3rMJTrFuYNfoU3xiZSiC7+YSmFIneldRF6VbiYUOmnBLFOLMs2nyIp7rUwG5lQiDfRElCeBdS5oRzVhyrn6IOf2sYqW8zXYpYGHzUNfDp+L7pD8agAzPwmAT2GFaBlwrYidDf05tgWG7AfQJSHQ== 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 PAXPR04MB8896.eurprd04.prod.outlook.com (2603:10a6:102:20f::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7002.17; Tue, 14 Nov 2023 10:24:54 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::7102:259:f268:5321]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::7102:259:f268:5321%7]) with mapi id 15.20.7002.014; Tue, 14 Nov 2023 10:24:54 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v3 28/33] selftests: mptcp: join: change capture/checksum as bool Date: Tue, 14 Nov 2023 18:21:58 +0800 Message-Id: <4429dc6be768171a5c85f5c7c3c3f472d2b105b6.1699956980.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TYCP286CA0167.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:3c6::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_|PAXPR04MB8896:EE_ X-MS-Office365-Filtering-Correlation-Id: 5b76ad90-664c-4037-25a7-08dbe4fbf188 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: IhQYAmX0ho1SkLTzTjBE0vHlcIdg3u2+63CN94Fl5txv+MZyc80GbteJLctGINLhliBuW32Gk1ghbUX5kmpXLVrRh54fKUpR+IczW97YOT/T/bjgIBFIPKb0PBRNyxgHlagUFIeN6gWXrGl5CtdonA6rpz+GDVTyogoY/uRW4wBpZ05C4zPEry7thCHLTeH2ChCJRO6UvHReKkUl9sI31LdmJqHFclGlPgbNCfoWG/L1Foin2EtFX9aO+HdJLS/30tLjDbz5O4JQCjhW4y2mRuEYdSUCOy8cso8DbGnlE1uxNdOUC7plkOAKZSVvJWN4C/BYhsIcWmWoQnFxX+wnHhRUA35g3rveuJuCY6PIjJnTLOrrsVK5BHSnvmDSx9WzYgGnFp7MJoNP1HiM3RQ/dZg0P1PX2INSBJBD98tt/9QxR9xZbsBfMlZGHa4O9hSKahADZEMN4Lfe0vLR8Wf1F7jNGIFXsW5kM6W0rJIyaXPfuFomvQXkyKxMfSBjiTU1tJkHH6fMdqJizEaB5nzyWDeRDFSjg/1JmhKqKj2022OMU9v8FYjjS/1wvcj9zBfO 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)(376002)(346002)(396003)(39860400002)(366004)(230922051799003)(1800799009)(451199024)(64100799003)(186009)(316002)(6916009)(66476007)(66556008)(66946007)(478600001)(6486002)(38100700002)(44832011)(6512007)(2616005)(5660300002)(6506007)(4326008)(8676002)(8936002)(26005)(107886003)(2906002)(83380400001)(41300700001)(86362001)(36756003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?N7+bxSVn3yiTcs7jI40hu2xP/hDir4uRkYxT3fMiwChCHng6INU1RZmfiqsa?= =?us-ascii?Q?kDdLy5i+FE7rt9SSM+AGDBIvy8qEGeV2Ikfn5Xt7ivQP02vSIONr4fxwRwth?= =?us-ascii?Q?dUMKQhwsf/8qyilxNPiTZ9A0odY4nN3S+1VTfKc92gJ21oCpxVX4oGH+d5we?= =?us-ascii?Q?aEGt2eLA7ynZNdgx92H7Ht6jgvWrzWiZqZgZEe3T4zBwXYHan8G7JF6LsQD+?= =?us-ascii?Q?uwejE4KppUU9HRs1fcCmf0K+0UN/VYSxam8H272cMIc+LFsVkEEOuza3aVde?= =?us-ascii?Q?K6fvAD3ljA625Y3Nrjyz2jeb898mLgixWoBLyiZwwsubRGWnCzoyNuHIulVR?= =?us-ascii?Q?KfvnbAqBR7PFIgVznSe/aOqk4m6KcOwTEGslwSZyW30C/HCF2LGAuwd5RLZW?= =?us-ascii?Q?90AG/8o//kl1YCfSJrwdolPlvnvp9XX2IbIhMIfYrjReCOhgAMZZc2UW7Fsl?= =?us-ascii?Q?p47MySNCGtU2bUiwQyTeY5+quJS8+tJ+YFZj8Z0/l7GFrkbEfvT8qlyMn1qe?= =?us-ascii?Q?L1FmTiNSUf6KfWuC0w0GDLvpK8HQDOr7mOt3Kcv5NhVEMLRf1RLBAuqjZcqt?= =?us-ascii?Q?j9ILQOw5krtwjh67qh6D1GO00bMPZYQh5o3MFw2ZImUoP+XqdLjkfb05/tyG?= =?us-ascii?Q?4g6ObhCG5Ahusyj4GN+gmoHvVVmq8TjsyjC48XVXnnElHg2++AgYRI3fH6Qj?= =?us-ascii?Q?4Fb4HlrPytCls47GXzReBh5JKMdCl+cQ/n6yKec9UW9rI4ZTbZSJGCDFR3sa?= =?us-ascii?Q?UWH7pEnGkTcKRrpkLBtG2khuD94P+jHDy45eq564z1YTK09v4jagXXpLNeaa?= =?us-ascii?Q?Nea/jEe1YhXcZWtNyU/JiEKGOFKZXy+8bbRD14ufXK2TWffMRa3nyaIPAsuM?= =?us-ascii?Q?1fReeEV9RTMF8eEzjW9x7aoDAlooZeLLUeycvpKaBSIgaDnS/k56inM4NCxV?= =?us-ascii?Q?YaOwQP1CyE1PA7PUJpjdzn4LL1eT7FgU+SkKhh820pDwjk77rRr5cQlt7snr?= =?us-ascii?Q?Yl1caCqZwfM3bBNNsAHPD9kQ4faqmHIcVGUdOCX6XwbVmtfIWg6lyxXSen7c?= =?us-ascii?Q?4P685ahWgjI2/8vgLsz2UxbXKmyyZY3Q9w23X5gugkh1p0/0v8Ei6g3pkY6V?= =?us-ascii?Q?QEcED27pFPAYVCPMH0CiIiVsHyHeVk+paIYx4Tzyd7Fg4bcbnF7oDIY7rSyL?= =?us-ascii?Q?9jk8sRAdmP6yYDbZov2NLoSjd3dafLFMCrWD9Qkanc6A90NEkkvmIROAswWw?= =?us-ascii?Q?L1kc1PhvUuf0+poNuZEVKBw26lPx85Yco7kwg8GORLOUohZyDGsxJR62mgWl?= =?us-ascii?Q?1M6o5gfjN9r7aof115nBGl2tI3PaYE1ntVnn0ErsN5n+w8zL9aoALzW/cTyx?= =?us-ascii?Q?C88FYKbdn1+t6lN1mjOruB168EQB8qeSskE1jJNwDH0gf2HbQ7vVNrgTXX3f?= =?us-ascii?Q?9sxT0gdiZI3lErTy+jAcJvOgs/LGr0gQcH1tuCNxQDG+ePdIQBKEHVsGiFEb?= =?us-ascii?Q?a7bHom73F5nMlF0j9j+Ch1VUX2KZ399oGhNPzpUUTA2sViDw4ub5sN3bw0Xx?= =?us-ascii?Q?4meOY4DMtvNAbA0C15uEPo21QIuyBIXZa0Pazj30?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5b76ad90-664c-4037-25a7-08dbe4fbf188 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Nov 2023 10:24:54.4353 (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: trU5d7/5ymNdJBRQuFMvLYQsaax2rR4noF/lK+ZIY/1bsMEqpOKDe5zCzybhKmhpUn3s+TRHd29bhRds3rEy6g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR04MB8896 Content-Type: text/plain; charset="utf-8" To maintain consistency with other scripts, this patch changes vars 'capture' and 'checksum' as bool vars in mptcp_join. Signed-off-by: Geliang Tang --- .../testing/selftests/net/mptcp/mptcp_join.sh | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index c2f78c849da8..63f89bc9b7aa 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -22,11 +22,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 @@ -76,7 +76,7 @@ init_partial() for netns in "$ns1" "$ns2"; do 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 - if [ $checksum -eq 1 ]; then + if $checksum; then ip netns exec $netns sysctl -q net.mptcp.checksum_enabled=3D1 fi done @@ -348,7 +348,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() @@ -381,7 +381,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 @@ -953,7 +953,7 @@ do_transfer() :> "$sout" :> "$capout" =20 - if [ $capture -eq 1 ]; then + if $capture; then local capuser if [ -z $SUDO_USER ] ; then capuser=3D"" @@ -1054,7 +1054,7 @@ do_transfer() wait $spid local rets=3D$? =20 - if [ $capture -eq 1 ]; then + if $capture; then sleep 1 kill $cappid fi @@ -1442,7 +1442,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 @@ -3579,10 +3579,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 --=20 2.35.3 From nobody Sat May 18 12:05:10 2024 Received: from EUR03-DBA-obe.outbound.protection.outlook.com (mail-dbaeur03on2072.outbound.protection.outlook.com [40.107.104.72]) (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 BA2EC15AF6 for ; Tue, 14 Nov 2023 10:25:04 +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="nT4Szux1" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MDNuBELVgqpUIV5ScMK37jBgi9pY9eByQLUypLTLObFpzFZIKTwLJYbL8SPAB/uZ1bBTeMr3xsLARPYuiGDPE4ehVbcPgzGYdI1f5WA729sWG1NH4fSCVP33mA9UmInUOOHlNTMvC1yymcbT79QjsmZxY5su3OQCMTtBXTLbadXXxOKomDKhlaS9oND0vDF3dTbp1LydLB1KOFKGHAGISaqC9EakXP+BrUwS5EU2Y5W8+CkgrQ7rsp4DiylaPldeMcULwqZoOgTds5ig+vKGWyElRiai4eF5aKuceJ9bdDQoG9iVmJlhOPafBoRIbMOP6ipa8XKN35A0++AMn3VeDA== 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=89vwzIBrP70ufSNlyGK1yDJy94W5tqbL5wRnkFA8pEM=; b=dWSrAuu5yB1hRIgjr32uRwkKgqYkRgUu/k9c9LL60z92BNY2h/Iqh3WqEdYQtsubLpKVIZ/UD7Hb5zQkZr3HHKDq/+uSH1PqR54waxe4sjakCcUdcOdgQSuzqOTDWN9Bpsn4f9hBZpFrQR3cOvWaE+y+70iGI4Th3qPROZ9ARpGtG7r6gN5twIdlZhdQjhSBy8oUPxhZ1QVgapYbQoVP+1tn+wLe4/a/ObMBbiPiHC7fwnl9hJtBpYI3D1H0OhGVg+/Zc5i9NANfsLt7bmMfM8RxpffdDjz2bMOZGW47Sms1qM57ViJkRqa8rZOq2T3ajLaPdnFEF7+75T4qri2uSQ== 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=89vwzIBrP70ufSNlyGK1yDJy94W5tqbL5wRnkFA8pEM=; b=nT4Szux192atFTTWqyJmZ7CgtstVzWLUFktZA3DlIWanhSpN1+jYtoenSpzWpuYx/selG8E1Bl+2Y3KSO/3UgMJeDdvpvt3eHzt89V9NPHfIZn7VpmGKAT0enhMYjsIVi3Qv1t+U0XiBJL95lYI9JQFR0OHFb39WhbhgSQ7oOrb/awpG85aKQkkc8xVTNrNgm+KeoWfgVjFgLgdP1xWpFJ0StRY8drO1fHXYN69vyY3Nq6GhdW16uzh6JqFHcpkWp+xsNJa0JnWcD+fpuLzIhLwRkO+2B0kV/hb/WuSa8e2AFjk4YquB8wvXOEyqAJvU2f02sCsWvGRKva/JC9BgLw== 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 PAXPR04MB8896.eurprd04.prod.outlook.com (2603:10a6:102:20f::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7002.17; Tue, 14 Nov 2023 10:25:01 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::7102:259:f268:5321]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::7102:259:f268:5321%7]) with mapi id 15.20.7002.014; Tue, 14 Nov 2023 10:25:01 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v3 29/33] selftests: mptcp: export capture/checksum vars Date: Tue, 14 Nov 2023 18:21:59 +0800 Message-Id: <1468526f0661fa6917e3771ca274bdac7240612e.1699956980.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TY2PR06CA0032.apcprd06.prod.outlook.com (2603:1096:404:2e::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_|PAXPR04MB8896:EE_ X-MS-Office365-Filtering-Correlation-Id: 022a60e2-c4c2-40ce-eeca-08dbe4fbf5e3 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 63e72IbJ1ucWagCCU8SgAWBdd1O448vbjEV7xKhu6aUzJaimNxERW86PeelaPCg46jcUuRgGfxRi7QW+wGoutDl98uABJq33EwRIST50LMsic1NsX0WSi0dvraXOn+8TaXmOr68NCaEKLb1QxewRc0LcV4OZRSdNdbfn3ZwN/vaqoRdCBYAzDEQRZMzMa5AP0cBohgojajj92Ih+FNufssU0Ne5TnKhiRtFdRQ10Mwc/BBaX4iHMTKwkHqJaZ5+QtKjMKuF0seo66FSkdUGu9Uyf60+TSmEVUNN1yn5ejLUm5S5N7vertHjgYg6fwNtiUiYW132N5VPIG9p4wtE6+H4n2WDpdcPMrChSbyJ/zMgtK1+Ud5Ha4uuwyUULcxYRE+bDTfobdHEDV/WcAeKqROgBhxTXTeAgCjhptRTxN/e+IxYy04YZqg092nG/1rDdt8clVPFYoHA0Plf0rjsJj5teaIyb4Wv9dkg6GcRqcFcYg+1y3SBlOLvoN9Ofg5OTy/VSubcd8MxjN45KtFK9uvm8qbORShZJS0TFheCS2H9C/dchgJ/KrVGMxgyhaELm 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)(376002)(346002)(396003)(39860400002)(366004)(230922051799003)(1800799009)(451199024)(64100799003)(186009)(316002)(6916009)(66476007)(66556008)(66946007)(478600001)(6486002)(38100700002)(44832011)(6512007)(2616005)(5660300002)(6506007)(4326008)(8676002)(8936002)(26005)(107886003)(2906002)(83380400001)(41300700001)(86362001)(36756003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?cqh3yOYBB/jjVs6BrtYi9rO+M9l+lkbHVDkigpQnUeRivjDAvcqP9xSSztwa?= =?us-ascii?Q?JJhikNcONr9b1JoSHwcAB01d6TxshHd1fudOAkxapgSPaTUh2w3fcmwgwsRT?= =?us-ascii?Q?jH2O6IFISG2Sx1S5GWMwCuWTBqyGCKhGUN43nj2NiH7TCEbXIO1b4/inXmQ1?= =?us-ascii?Q?5zWLtJgRuUkQvYNZ7KnI28Ulg1RhniGHqvwcOasJWbkz4WLXeiy6IrouioH0?= =?us-ascii?Q?gOWaVQjWa91CQVI7LIIH9n52HJGdTaGipWh7dLQpXwonU3yE4zIJjFsNTC/7?= =?us-ascii?Q?5Z1P88liN+FvWkPFZZ9EOpvU0Ou/SPbw3m2D97a7tPODduubNN5mcUAujX9l?= =?us-ascii?Q?sWdqsNMFGIOc1uUXIgw0NDW3zUiUYUqsmdCz4rQ6Byp8ky7ePmEBpt5M2mTl?= =?us-ascii?Q?m//NjLu4jBDs6zJcrsSrgrRnf4EM2NSRLBDoO3halzwTocRhFdJYtyDYz1wQ?= =?us-ascii?Q?7Cl2+T/rqQc6GVtPH/8SDz04A0IisifO9zQ0hy2MaR2xxrHZS+WdKXcxGH73?= =?us-ascii?Q?t5T+p3lyVNwNP9JGS30ei8O4lVJ9ehs4w64mIa0TYCwqBcOKA8vyiS30fAAk?= =?us-ascii?Q?zhUg8eMpfH3yv5OvnHBCCOnnXG0YCQnC5vFipKUFbOiltlg2sjLnlNOwh94m?= =?us-ascii?Q?gK8Z8Ahkr96+sA9KVObs4Df7UJNakkSW9SudYXCnON2W2orGgTtVqLcw3WXN?= =?us-ascii?Q?I41rpzkX2je1wk0reoxXEFPX3Uc01jbhd8HBfb1mkZ/+frYadIvBtWstrDSa?= =?us-ascii?Q?v8g6cwbZizNOVGsD2u+pyQauWpENoSs+aKomXheJKeGsORIadR4tuglibjD1?= =?us-ascii?Q?DYoyFwGP7ELGIwf3LzpZCc/fXmadEDR3U1i1lqHL3pypTzqRKa3+l7jqI5ME?= =?us-ascii?Q?tUDRuCwoWiDnGuPBL5y9S6+GLrzqRsel12nH78nWT+8/G8rNwwwW2M2dPZSF?= =?us-ascii?Q?VjbA2iwyDpHmAFlxcajBx29uV2veR4JPn3Xd/0NzhnubrWgNpXCwqB6XbVMO?= =?us-ascii?Q?EZebys7SlCdwBxAlh/HAmPmlhc83g/WTCMhRDSXCWV9bJN07E/xHGcMvsx5+?= =?us-ascii?Q?NHKi8Ajm6rrMpm6k4a1TiK4iZIIG4NAf8GySas3oEJQUiMSa4rbrDbp7Vrd8?= =?us-ascii?Q?4FNrhA9ytcu9Tzo+ingZlHdf1Qq++jzbmbBw7DJ63+3J8a7KJebKZkIeGTeU?= =?us-ascii?Q?dzbaGzXU68gnruIsV4VynwNHPz0P1ypSjRJP5wyfSUPzfsDsRnzDQjN+Pe5W?= =?us-ascii?Q?bFnGFNP/7O1aepgG9UpUnNHUbL+KtJdwId6W60k2DVLl3JbBjhQ6qsf/kExf?= =?us-ascii?Q?jPaQkDoJPREsxZEZfaj1/s33NqEQR3ZQi8P89Fqbxi1PHYjSqg6hkIwPaz2q?= =?us-ascii?Q?cXOfNXD4T0NXNRij7Y9RINEa09zJi8R6XeAGzAvDWacjzuOIOyylcBEclkuc?= =?us-ascii?Q?fQWAgE4gT4mJIHzIxNIPAYmocPemleZbsG886j/7BNYWRF+KUV3iFLSST1Yz?= =?us-ascii?Q?CpveTE/hk5kysUKjhFJ3YQBnHWHaGJO46YCXU1twgrVR3sL6g00FNOy5pIch?= =?us-ascii?Q?ufePRrOCW6BK1FTwflFYhlioBcOrSt34fBvOmz/W?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 022a60e2-c4c2-40ce-eeca-08dbe4fbf5e3 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Nov 2023 10:25:01.7522 (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: J0JM1gsTiWuzS7Rnhyo91TAOusuRNgnFYaOUnjiSXZQndmgW6SWesBFHiEQMHjmvnCDnxv7yzW+K6IMBjuF7RA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR04MB8896 Content-Type: text/plain; charset="utf-8" The variables 'capture' and 'checksum' are defined in multiple scripts. So this patch moves them into mptcp_lib.sh as public variables. Signed-off-by: Geliang Tang --- tools/testing/selftests/net/mptcp/mptcp_connect.sh | 2 -- tools/testing/selftests/net/mptcp/mptcp_join.sh | 2 -- tools/testing/selftests/net/mptcp/mptcp_lib.sh | 3 +++ tools/testing/selftests/net/mptcp/simult_flows.sh | 1 - 4 files changed, 3 insertions(+), 5 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_connect.sh b/tools/tes= ting/selftests/net/mptcp/mptcp_connect.sh index a2511a37d9ce..59482d5476c2 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_connect.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_connect.sh @@ -9,7 +9,6 @@ optstring=3D"S:R:d:e:l:r:h4cm:f:tC" final_ret=3D0 cin_disconnect=3D"" ksft_skip=3D4 -capture=3Dfalse timeout_poll=3D30 timeout_test=3D$((timeout_poll * 2 + 1)) ipv6=3Dtrue @@ -21,7 +20,6 @@ sndbuf=3D0 rcvbuf=3D0 options_log=3Dtrue do_tcp=3D0 -checksum=3Dfalse filesize=3D0 connect_per_transfer=3D1 PORT=3D0 diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index 63f89bc9b7aa..d36639e48027 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -22,8 +22,6 @@ 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 diff --git a/tools/testing/selftests/net/mptcp/mptcp_lib.sh b/tools/testing= /selftests/net/mptcp/mptcp_lib.sh index 1d7f69d36b4e..b5f3d5e0f118 100644 --- a/tools/testing/selftests/net/mptcp/mptcp_lib.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_lib.sh @@ -23,6 +23,9 @@ readonly AF_INET6=3D10 TEST_NAME=3D"" TEST_COUNT=3D0 =20 +capture=3Dfalse +checksum=3Dfalse + MPTCP_LIB_SUBTESTS=3D() =20 sin=3D$(mktemp) diff --git a/tools/testing/selftests/net/mptcp/simult_flows.sh b/tools/test= ing/selftests/net/mptcp/simult_flows.sh index de897b226d40..67643ffc5c08 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_ns_init -capture=3Dfalse ksft_skip=3D4 timeout_poll=3D30 timeout_test=3D$((timeout_poll * 2 + 1)) --=20 2.35.3 From nobody Sat May 18 12:05:10 2024 Received: from EUR03-DBA-obe.outbound.protection.outlook.com (mail-dbaeur03on2074.outbound.protection.outlook.com [40.107.104.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 BB29A15AF6 for ; Tue, 14 Nov 2023 10:25: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="LSsvq0HZ" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=HECxIiEDHDl4ldMieByzoAqCJG/LwxTOPnaugo9ABOZ40g55YLf+sXMJm3aWhvVRgpPuhKJoJNeweySCSP31lBbP1ifkHiz3JARrwMAYWjlsHFqEfRbY0EMCv7HtGlJUc+eyA+cmevhvwg+hMvjvonWxyBU8cyNWtn+q/YIIQeFojNUPpu3ksLef0JM8AVhixSLNbWTN4uIRQD89HcQRSlSFRuaeT4D5HMjDnXv9YgaDSbaLsmFCchFt6ccx/Ad6vm2oemBsRYLLMEhalbsxpMtT5rcURsqka236qvYPV5TcabeUC/jcsiyqnvRra3yLzCxRJpdSm+kAeyvnc825wQ== 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=QdUl1ixjV1bMwJiLktDaFUKI1bTI5vMYphE5VCSMZrE=; b=j+1u0u3Wx9OY3S1GJblvyWj0GF/ld4LNqlya39wxBBoPyokFzVFH7slGEoYr39y1AsdlTNEAYMYjyveD3ymO1wSo2P1VMen1K/0R5m+iW8gdye0yjVaokcbhEqInBtLjrQnX2CvmCtKESVQAJKkeXP+AD7MqvAZSoO80wTlMHP9v/eekH+mYrC3rbfWK+SKwCI141oZiULmLhiA5r62GSWQVMs9YYORavcxisKWfkQSbuixiXrjXKn7z/1A7ZuRQ7Hiq9456GKBXMQeOCA4PNEvL9KQknml7/DVPQ+4tXM0D+cpkY1+9J/usU7CbcfcgNkXyQ9gexMUXfqd95lT3eA== 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=QdUl1ixjV1bMwJiLktDaFUKI1bTI5vMYphE5VCSMZrE=; b=LSsvq0HZzwmESHFKYx9CuS/18XMfXWtMs2VTyHqmUgnlqYcN75z5BNu3UMkzGc755Wx1LMdJ3fUR/NQYFxQIVbtnbrc8PGZCtqFI+7GYG7esHxIxph+APs9N6qP/Syitu+HX3CKQdxeXmtNTYShMUS34GBVqKJczAZzfMJMOt1fHWpLKZCv05XmYRmwvb0lK4GyZoWiju6PC4r1OXAABnMqJQ4cWXIYmuHCq4Bv4K9j4fEWudOputCVx/HhV2IROi4SV5ETdFbX0t6BlsDfe25UDZseZpFhPJxyuW1Dx3Ag5kjUHq01IXCTctvYAgUNM4Zl6psfcPA/4VNCoq/wK6Q== 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 PAXPR04MB8896.eurprd04.prod.outlook.com (2603:10a6:102:20f::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7002.17; Tue, 14 Nov 2023 10:25:09 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::7102:259:f268:5321]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::7102:259:f268:5321%7]) with mapi id 15.20.7002.014; Tue, 14 Nov 2023 10:25:09 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v3 30/33] selftests: mptcp: diag: change timeout_poll to 30 Date: Tue, 14 Nov 2023 18:22:00 +0800 Message-Id: <44092593d6250e7f036501f350358ab3c9881bcd.1699956980.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TY2PR06CA0048.apcprd06.prod.outlook.com (2603:1096:404:2e::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_|PAXPR04MB8896:EE_ X-MS-Office365-Filtering-Correlation-Id: f7125a07-0006-4a45-173a-08dbe4fbfa80 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: W8m15tWCni6RnuGRxODdJnPzuqFyyCyYT7Fh++h5AUd6RcrhwWHFluGmRBcmEgFD/dR2OxdyzruF9sl2D0bi+zscPTxGY1XHuK8CyY+gbTsISGB/SV0WTZy9WopoCWRNRW64gM3/s3fsVaR20BGdfQBXgMN5KnKoOnITaHIj24aAE5wN2lnEDhFznQ4Ha3DoJcpRQZLsd7SXcZMcoCf1/ovfsPAGu3mOZm9900v7Ume8LO5h3J66U0f4Xty9beRnl83TAaDebwiAKNtE39nUb1sBTEl+orlDsaljiA0nm6CmDC1Y8RYuRnNV8oTJB9Vsad1wk2X206DXr/4QNxYMK9eBJlFO1uoqyA6CnAJsVH8hQXIK0SVN7z3Twq7B+W3a76O/ORrTbOqVtld+RG7mnAVvOpZvRpX7hHJ/I7RDzW8hmZaceLq0rkMRDkoXkv1EZMCJIavW5kzn3Kc2RVuVczTTDTm12nlbDCNW6XkZUabf7ao839Jd5BtMDO+PgArLCbObq+fQ4ha33limQa8obCi1Fdf/gceXyRWC8I4mQOJan9rkIYTZ+5zDkPCddAUG 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)(376002)(346002)(396003)(39860400002)(366004)(230922051799003)(1800799009)(451199024)(64100799003)(186009)(316002)(6916009)(66476007)(66556008)(66946007)(478600001)(6486002)(38100700002)(44832011)(6512007)(2616005)(5660300002)(6666004)(6506007)(4326008)(8676002)(8936002)(26005)(4744005)(107886003)(2906002)(83380400001)(41300700001)(86362001)(36756003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?cYmj+HN5qbun/LnEd/fx3Zrr4sCN2bpsRNsyO+RdRTFZj03XxlVilm6Dgt/b?= =?us-ascii?Q?pfCe/3F9ZOgxqANxYlSX11CTal6+6tqek50oJSrKvgJCUkpFuUdIXlnjUjdB?= =?us-ascii?Q?2lRQu7JeccRnstytUvQnz0P9T71K9OjWBZWH2sKfHE60TC4S0p+M6IpsxR4Y?= =?us-ascii?Q?xyXq+J01y+hm1ji7XrZsmSwSeDm/qfi6fu+mHVUINk7ZeawqA/LovyiSguEE?= =?us-ascii?Q?fySUOYa+MsJEcevnnlpHyYDkzpp2gn+KM4TQYYYIczfMVfUfxSS+YiRxFA7I?= =?us-ascii?Q?ZDZ1LZv73+ESQW2YfOBT9OYyx2gRR/AzkARnpQctswrGsWCNJxH2jxuR/77v?= =?us-ascii?Q?tUHTQe8zCTkcXbY3tyU1YWRaqC8O8ZNgvrABuw04NsPGZiowfoHPIywCi0c+?= =?us-ascii?Q?1np/G0LH8hVGgJvK9OwejjAB753UsPCBpGOT3hN2BF3iKuwcpy8QOooaHo36?= =?us-ascii?Q?RSsr84godm2FaMkDUu45kM+3wF/QydOf59B3UkmypMHu83dqJKgGC3tzhsfo?= =?us-ascii?Q?yUMhiUsHNI0hzKP4DV255gkjQNYhMFkSIkh20DNxRH65QyUgTuy4Mb4lTHZy?= =?us-ascii?Q?T6wIigxZ2mpo9f6hoo8uczq2vkp2SVwm8AhsbMLhNhDsLGFM4aa17x+QeCjc?= =?us-ascii?Q?oENmj3FW9h0Uv8IWr0glJTa/o1oFKZXinSRC6sj+eqTmTwc/obynUBTdQG9u?= =?us-ascii?Q?QgG+IfR2h7tOp7VQno/n5AfQd8FVaQOra1OVz8JPjURjX6M8UodA+p1SLF3f?= =?us-ascii?Q?UV8dvqxQTiiWD2zLI5tuW/O+x7eQ7M0I4BmujuIdr4nN+zHDT5I4cFKqmxi4?= =?us-ascii?Q?1Agcw7Sf6Hwd6RLyV/ObJHOCXBGfanTN4cLtgpi2qGMJSaw1LB9dIitmCSUv?= =?us-ascii?Q?u1yy2ztvd+y7rko0taZYLYWe6GD9FhbqqorvO++ULoLV8xSrU4J++wviqbSv?= =?us-ascii?Q?IwHUttKWnrH9mbTA6Dnvr1lPuz8zySHQdy9SRBMa16crRuwkrhfk6bkwiJBO?= =?us-ascii?Q?3XKrfgIgGd+e8JOP8EkSsFNT7feqKIabBdJDDGZ4XPK/x8u5f0YSO1Dw4pOR?= =?us-ascii?Q?vOpGkCTzQ+Yv8zjIh5KUZntpQte1GDcoyze200YCeM8lokcHOq6p4exVNGvc?= =?us-ascii?Q?sBMCpmLkgAqK7mu2WS52haREDUm+/9Wqo57jGYmAY9lr4XxTiYIqAcTwDeEj?= =?us-ascii?Q?+uawKq9BHbBnABWDfDSBniUgM372BrDArSHBBJZrEyO+n9rHYRIyuZpG8Ty4?= =?us-ascii?Q?34fkmTWNtZgu6QwYtwS8WgW8DaVLQMHQuCyoRP1tSWFy7POprHRUpbjLFrWE?= =?us-ascii?Q?EXqPC88PWDu3IjE9kdTIFH/Adhz8f1RSC3CAHviw/ef6I36GcKceVZvCgxM1?= =?us-ascii?Q?sgoCJkvFWZxMR9WOIOPQjh4MxBjV12ThMy8DHJSj1AKN/jtSxrbIaLXONWm6?= =?us-ascii?Q?F8UR3Ma7GQ1rX1gPxSneR0c6MStJ5nEfVx2EAIr1cGsN/qRvhMEVjm+9EJSJ?= =?us-ascii?Q?FlPytePA3QMwTe9i+m3lQ6QesSU6TFWGKgnAM07iKo97mjRT2wS+053JHaYr?= =?us-ascii?Q?kochEFbDO18Jg7ELNqS3gw0rdwewUhaTw6jO2dU2?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: f7125a07-0006-4a45-173a-08dbe4fbfa80 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Nov 2023 10:25:09.4882 (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: FS2DUL59Kaz50thJByuMECaM0cR/excHCkvqkdZ/FmXaCsrML1JlKx4hXN0MuiDuRKjemEAGNy7xCnAqR6pbtw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR04MB8896 Content-Type: text/plain; charset="utf-8" In most scripts timeout_poll is defined to 30, but in diag.sh, it's 100. To maintain consistency with other scripts, this patch changes it to 30. Signed-off-by: Geliang Tang --- tools/testing/selftests/net/mptcp/diag.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/testing/selftests/net/mptcp/diag.sh b/tools/testing/self= tests/net/mptcp/diag.sh index c7a7c0d2792c..b5a17d2b6723 100755 --- a/tools/testing/selftests/net/mptcp/diag.sh +++ b/tools/testing/selftests/net/mptcp/diag.sh @@ -5,7 +5,7 @@ =20 mptcp_lib_ns_init ksft_skip=3D4 -timeout_poll=3D100 +timeout_poll=3D30 timeout_test=3D$((timeout_poll * 2 + 1)) =20 flush_pids() --=20 2.35.3 From nobody Sat May 18 12:05:10 2024 Received: from EUR03-DBA-obe.outbound.protection.outlook.com (mail-dbaeur03on2086.outbound.protection.outlook.com [40.107.104.86]) (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 01BCC18C1E for ; Tue, 14 Nov 2023 10:25: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="yYogN60c" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=SC/fkeLDSSTGxJ4XWKtIdill8DG8TdR1uGW7dPCNDwJ2iBbhhQQkMsKZrkyTzsL8cFXKKibOzTqvpytT7CzY1BRpHIEYEG65qmggnVilxMflMHJcwr+aGC4zi0Bocwap7S/MEW1xcIT9sjCgrR8JT8n6Wn8MW6Zkx2a13tXOpDNA8zeyL+0k7U50gSY+lGYtKXKk2eihG2htmnV1DiUzeX27RfhqoKqHZOVz26BW+nsy6nVGfPwLVKlYS6AYv1gMLufrGW0KBZ2zzkEplyy06JU4snSx/Xc0NRUBgq1MK9SEjXDBNmYgwE+Ksy3iG6MvRbkq9di4NlOn0W36cyUFNQ== 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=GK+LF24Y+TDfdsorWfCD+iDGr2VXor0DTl9wAL6tO+w=; b=jJV9jo2r1oXXenDNSsAmM3n4ClNW8u/1Ohei4opMFEmKwC5x+pidHIuTUn9C4bPSqa3QQ7LgQBqkLv6sD6xff9i9NhrFIVqBhWfVRm+ut006qM3ki818xlut8DlDz0dv3rjcRFS5GojlMamqw/VjGXqn5KNW6d44l43xoq1tvCwRHg1PTwFwHInki43ZZnJgG+/5MtrX0vRgeYExJX6TWDb62K0PLCzVsGx9ZULDEXoCup87SPTHyG/qEyuW+IQUbzjxL6OywMHlGuEy8bn+LVPY2lBTX54JQKefSfLH7XL6UnsPhSuMQagSd+L49Fqan3s5GqA1l9MsSKGkpL/FFg== 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=GK+LF24Y+TDfdsorWfCD+iDGr2VXor0DTl9wAL6tO+w=; b=yYogN60cjpBTVMnk/g+KVd94ilrR9jpy4cD4aLwDa/HNo7mdR3cWq36ZTeJyBzr2yJrPl67GOP0xYQbVv0aaBfqA9f0M+DHTrTzJLN5K73BoAq/64vlEg+Ff4am2Esp21PZo13UW9Re4y8AqksWHE/mYhJp8yPF2iKKIN3Ip83JwSOJCUkdTnmNSoW+3QQ2wGVuW88R/etOq0ggjuoza3kWz5UMPL6vLUU+ez+Umw6Ko17PmTTq6uKhcIeblZdwgIzmZGP+AtqvzjFHrVqW9Zy7Pv4XYfFI/G46LqupJrBtT/l5h/efc5RKQKRG4OHKnzfx9NZSTf6ukd2wTWuHmHw== 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 PAXPR04MB8896.eurprd04.prod.outlook.com (2603:10a6:102:20f::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7002.17; Tue, 14 Nov 2023 10:25:18 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::7102:259:f268:5321]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::7102:259:f268:5321%7]) with mapi id 15.20.7002.014; Tue, 14 Nov 2023 10:25:18 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v3 31/33] selftests: mptcp: export timeout_test to mptcp_lib Date: Tue, 14 Nov 2023 18:22:01 +0800 Message-Id: <126683b5838f53014dff4883d3e3e94f9c895a99.1699956980.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TYCP301CA0048.JPNP301.PROD.OUTLOOK.COM (2603:1096:400:384::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_|PAXPR04MB8896:EE_ X-MS-Office365-Filtering-Correlation-Id: 4c2dbe35-d34f-437c-253c-08dbe4fbffa4 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: dtqdFlB6B8q/+dVe+y1I97qdlbXBw09yUHr+vRnYJKmZV0swManjldRSnaFhSotyZPk+fgIXSW8F4OS7+aZKZO09rtzEj75DdFhdn6uTl5/11ysYheY6MgigHXVHzgqI3LOZGU7EBrBhWs6i4C2PCMMh2Lk2sAXugp3qmmYPR6XppiUZaX5NM27aAdGFcgBD305NTrJypTAYYVSqQSZrPya9+UmMe2hdKrVkl6EroEQiEipUtjaD8CEyvxLJkHUbWWlMVg9WseSA3GsnGkJvZO5ZeuohnLI4GPNATKBpmf1GEOj2YTDEFyGYFpbDjHioyzaqkBzqlE3OjBiSKRzV0haORSs/BbOQVyENEnHoA+N/ynOSJzJvkPvDYJbBgXy+47CoXEzfXis8+GJdDk70eDydnoMKrPAolPBNKtPQu8MjB0mbdkE5T+zxuAX6+Bg7F2+DpW95bsLkQMiL//9sG4EPmbG+a9pTFZvfW7pUM4lif9kkaubQ0wTBeSz9eRBNMZ5Og1KG3if4LI4ABPoBMKFCtACpKK28IsSQ9kc0bk4740dU1gjqszBic2aap6X0 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)(376002)(346002)(396003)(39860400002)(366004)(230922051799003)(1800799009)(451199024)(64100799003)(186009)(316002)(6916009)(66476007)(66556008)(66946007)(478600001)(6486002)(38100700002)(44832011)(6512007)(2616005)(5660300002)(6666004)(6506007)(4326008)(8676002)(8936002)(26005)(107886003)(2906002)(83380400001)(41300700001)(86362001)(36756003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?gIFY2Y+yDkmVZbPDF4SpE7vrY0mTLHHmf1APKMbqSJKdc+wrylskKnAKsuaj?= =?us-ascii?Q?DHYVrJMb9txyOfm0fo2P++kddiwHU6RSs9f7Rcwz23uf4hsjTpkbmCQsw08h?= =?us-ascii?Q?/Rb54hQfLRHRftcEVUWIwohMgsp8NpAKscagUc5P+nr89p+1gk9CJaiIbJ4T?= =?us-ascii?Q?ugI3H26dBfR7kL0SuYOqjjldmJbYaQHNGuK5h9wRj9yT2XhL6cQRKq6fOh1A?= =?us-ascii?Q?ym5wzNfnH2RrqlwcTK6aoibhh8x6XYCHe/K6jtoEqV1AAVKAjrbdDbLOtkIN?= =?us-ascii?Q?Bckr/A6n+p57K4sSgJW44pWq6yCHeaXJpuGeZLo+u6s+z5N4ygD1ZNoT8rmH?= =?us-ascii?Q?+0BFzTG6PlliOYeHwraMl3T3xvw8pF/gx+cWH5Ei4WzphWTtODkN2X3GmRtj?= =?us-ascii?Q?5Y+MYZaoZwCArT2P17o9Kb3xDbTd7jFPTgkqMT0BdyIpGbpT3xUqZzcTT/8V?= =?us-ascii?Q?r4e6l25AJyiofeSMnJUIk6lJd622NReHAn+n2bzZPloWUaYwzWyg2EoHOaKl?= =?us-ascii?Q?xFHJw9xgiFrrhUBc+rOMNaoJsAAOM5TMX65HoKPi+3eNro8kvx+G8qCiHvqB?= =?us-ascii?Q?/UxL+8ot0OMbbFXP1xjKs+ZkRAEjdRtAV+OTCjV4x6NuWHKfUeWF4IRzTykz?= =?us-ascii?Q?TZatSnVsQc0y5UN8gFeaEBIjLPB/HS3HyYyvHzn+IpDZKWF4WHoM/Jg/93qJ?= =?us-ascii?Q?TVcbJWnDVPT2fQVstyBGSmu2BvQLlXcDYSPLOibmVo0gKblZjfli1XKZhT+e?= =?us-ascii?Q?wse2/t3T5j48qdJxbGYIjOQ4/2Z0tr1TSDHuveKpTs6FaC3uguVidWAWHwnc?= =?us-ascii?Q?n4RKbcVJBQ6l0YppRFMq1DxjkRo5FqPc8tBkHpPwjmaYt9jTmq/JnFDHPh7f?= =?us-ascii?Q?HBpnTy6KtCbIFOIulpnXfEjWgPWAaxIJyeb7yXpUy6X8HjxodbBDPqEECbaz?= =?us-ascii?Q?k4IwZOJlhsXy9abAyUubXL4G0+bYosShZqC5IM8wk7xVB2SSeof6FQIOrQln?= =?us-ascii?Q?7ap3XwVUFBiwe0IMr1QnJlcGs63otQVY0fBMMLB28bzYOFfBsI9zXTI32hKS?= =?us-ascii?Q?6Kikrp6MjJtqgUn/PhBx4WvM07ZhKkIoFROrVksYtLhCE0Xt8Bj2qdGm8ZiQ?= =?us-ascii?Q?4haemi7R7FsfHN32Ui9XMc4KNljmgGjDRG8zTRVYjSIob7CTSGd1HVdLoI6K?= =?us-ascii?Q?qsNjDECzwyKtVtEUjr8+DQdY60npdr/O+WEuYTrxNqt614WgWQjWaH+iK29n?= =?us-ascii?Q?uFxJ2uAg0CQ7bZC5ANHFETQWnzEsbuLzzhqEjAN961gzQZbSsxcA1wg6TX1v?= =?us-ascii?Q?colXPTSxfJylENb1DV+I9mmsgH6cgo9g9g8AQzcWKYHWM9cri8hhn0+weaYf?= =?us-ascii?Q?kuTjgQi/kp1bllQIqxJU7JVPrmNZnwg/z1riNpzDYHkra1AMPSOv8/B3B8gG?= =?us-ascii?Q?1h41JIqY7mVuS683tGQEx1eNvi6hRnag/FyOny2g3M+rFgui8kH9D19mcLiP?= =?us-ascii?Q?M2f/lPFRXlPKVh60ZBTyozlhG+PXBwRpntaxLzzswy/28FFeJL68+3UPruUI?= =?us-ascii?Q?hggA4tmUnHHHRoXkFlRUMyZF9aMyTpUt8K3jKJ3Q?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4c2dbe35-d34f-437c-253c-08dbe4fbffa4 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Nov 2023 10:25:18.3703 (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: ukhA0yDJYgZv5Dr0qmCAfFuwS2rQJhylNiz4fO1UvuO+tkp/W+TdH3M8JjYp6rtbvZnjEcyBRwvXA8epQVervQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR04MB8896 Content-Type: text/plain; charset="utf-8" Move the variables 'timeout_poll' and 'timeout_test' into mptcp_lib.sh as public variables. Signed-off-by: Geliang Tang --- tools/testing/selftests/net/mptcp/diag.sh | 2 -- tools/testing/selftests/net/mptcp/mptcp_connect.sh | 2 -- tools/testing/selftests/net/mptcp/mptcp_join.sh | 2 -- tools/testing/selftests/net/mptcp/mptcp_lib.sh | 3 +++ tools/testing/selftests/net/mptcp/mptcp_sockopt.sh | 2 -- tools/testing/selftests/net/mptcp/simult_flows.sh | 2 -- 6 files changed, 3 insertions(+), 10 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/diag.sh b/tools/testing/self= tests/net/mptcp/diag.sh index b5a17d2b6723..f646fede9872 100755 --- a/tools/testing/selftests/net/mptcp/diag.sh +++ b/tools/testing/selftests/net/mptcp/diag.sh @@ -5,8 +5,6 @@ =20 mptcp_lib_ns_init ksft_skip=3D4 -timeout_poll=3D30 -timeout_test=3D$((timeout_poll * 2 + 1)) =20 flush_pids() { diff --git a/tools/testing/selftests/net/mptcp/mptcp_connect.sh b/tools/tes= ting/selftests/net/mptcp/mptcp_connect.sh index 59482d5476c2..683172e626b8 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_connect.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_connect.sh @@ -9,8 +9,6 @@ optstring=3D"S:R:d:e:l:r:h4cm:f:tC" final_ret=3D0 cin_disconnect=3D"" ksft_skip=3D4 -timeout_poll=3D30 -timeout_test=3D$((timeout_poll * 2 + 1)) ipv6=3Dtrue ethtool_random_on=3Dtrue tc_delay=3D"$((RANDOM%50))" diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index d36639e48027..3b92a0b78605 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -20,8 +20,6 @@ capout=3D"" ksft_skip=3D4 iptables=3D"iptables" ip6tables=3D"ip6tables" -timeout_poll=3D30 -timeout_test=3D$((timeout_poll * 2 + 1)) ip_mptcp=3D0 check_invert=3D0 validate_checksum=3Dfalse diff --git a/tools/testing/selftests/net/mptcp/mptcp_lib.sh b/tools/testing= /selftests/net/mptcp/mptcp_lib.sh index b5f3d5e0f118..5c32fa8e91f1 100644 --- a/tools/testing/selftests/net/mptcp/mptcp_lib.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_lib.sh @@ -26,6 +26,9 @@ TEST_COUNT=3D0 capture=3Dfalse checksum=3Dfalse =20 +readonly timeout_poll=3D30 +timeout_test=3D$((timeout_poll * 2 + 1)) + MPTCP_LIB_SUBTESTS=3D() =20 sin=3D$(mktemp) diff --git a/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh b/tools/tes= ting/selftests/net/mptcp/mptcp_sockopt.sh index 8640dea7abca..2d5b6ade7df0 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh @@ -4,8 +4,6 @@ . "$(dirname "${0}")/mptcp_lib.sh" =20 ksft_skip=3D4 -timeout_poll=3D30 -timeout_test=3D$((timeout_poll * 2 + 1)) iptables=3D"iptables" ip6tables=3D"ip6tables" =20 diff --git a/tools/testing/selftests/net/mptcp/simult_flows.sh b/tools/test= ing/selftests/net/mptcp/simult_flows.sh index 67643ffc5c08..a598deaf890b 100755 --- a/tools/testing/selftests/net/mptcp/simult_flows.sh +++ b/tools/testing/selftests/net/mptcp/simult_flows.sh @@ -5,8 +5,6 @@ =20 mptcp_lib_ns_init ksft_skip=3D4 -timeout_poll=3D30 -timeout_test=3D$((timeout_poll * 2 + 1)) bail=3D0 slack=3D50 large=3D"" --=20 2.35.3 From nobody Sat May 18 12:05:10 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 E620918C1E for ; Tue, 14 Nov 2023 10:25:29 +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="5XllV8MQ" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=SDgCOCwN5uUd3xsK40RtV72UqNgBKKp1uv+Qo2z+gryIPII71c/kWJKW1AhbPBEda9IXIRAqWy73M7sKZqsRuK/CUWfUYg0g07FF8S7Ro28+j/TOw8C+Ur4tzuTRFUxxDHPC+N73hm3P1d7XpywyJV+PXjITkRLfrYE7h3PSHoBsQvhM/PxpxADrL65fU0YV8O0sgvLCPOhBRtbwvS8ExHUzW6zmTkN81f4uaYaOZE4sKYwsrGxGXhXz/YwP55sY1lbo3mk8OG0ergYS07i3Ou42sjdeSq4tVp5aQLeJW/MjbSFpv0ieLAtzjYxB9L50AeqrzU7Yv969uOKlgUTkyA== 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=Z4Z444dsSUk4WVg16ltpMHA/NNhiPMgnURtTEj0+um8=; b=TlwfiI5gvBCAGkw4iYwvlqiBKpFXTESw8jg/S/2OdweKgfN+rZOzkqT2jq5WLtHkRy+AkcUadBSe9x9XE5qaNeUqQPwArp9ZcEE/VcBRBxWf4k5aFaTgJqqQSHILfG9guLyQrA1r+xGBXXE28xmZHpY/HhTKCDekb0g2U8qXJ+w+2Rgc9LBUDUW7KEaMYfeN3aD1ICEqJL67GRATZ0L9V8FCKkWjW6inpxL1luEsGkiVI/vLxDdtO+tzW3J1T6xvxODWb4Ejkiz+EVmpqv0PRgo3vxzzNc7cFVLqelNPIglkgcPWMsvhe1PKCKB9zgT3JiiaY+LKImUI2KpVg9I+RQ== 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=Z4Z444dsSUk4WVg16ltpMHA/NNhiPMgnURtTEj0+um8=; b=5XllV8MQDsLO3zwdmzDEdxcWU3vQJ9JrC+sEEKd0ApHQK7JMrFbsq5ZOei5Tr4oacJj2EXGgcTPAaGdxHv0p27PnT/J4qfbhEPIvY17KHT4Q6p6eEMMhxpa1ko3bYkAKsuTgqb7oSEq57vdgjJCdE/4/OJgZPH1VhFupneaFC3dlMs5DnHZF/AGRDZQzK0NOxQ6ihouMHGbc3bFTL8VFtciqBm+0c1CxbQj+aB0ATypHLTWWGA6rYWDm1X3XHQavg4JE2be2xpPqM6XDlFDyY/E/lO2+2jy9etAjN0wbtCyASBulX9wilVVG6Vrn/On1KbQYV6neEZ+zh7jGJr9sjQ== 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 DBBPR04MB7946.eurprd04.prod.outlook.com (2603:10a6:10:1ec::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7002.17; Tue, 14 Nov 2023 10:25:26 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::7102:259:f268:5321]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::7102:259:f268:5321%7]) with mapi id 15.20.7002.014; Tue, 14 Nov 2023 10:25:26 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v3 32/33] selftests: mptcp: use KSFT_SKIP instead ksft_skip Date: Tue, 14 Nov 2023 18:22:02 +0800 Message-Id: X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TYCP301CA0058.JPNP301.PROD.OUTLOOK.COM (2603:1096:400:384::7) 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_|DBBPR04MB7946:EE_ X-MS-Office365-Filtering-Correlation-Id: a89c462b-406e-43ab-37cf-08dbe4fc046b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 0fGs80SW2MsYvfrupmh9t8iT+4YfB/c5TCJZJ1djYSOQ5dIdWQz5L50DUcYtE0D+HVIE4ssy+Azh0ugj0gahnZJsZfkdt/G1kuckWi2QBdkx34ta3qQTHVuy1kiZyEq9PmpC2p+qASCjGHjNt9WkJfZlQ/FpD2GsO5FPj2pte9x0K0wg7/xaulkuVkOlrbr8S3yuMrpWEQJ0alRBVvG8PeAnv5FEC7XQq8H2NK0PxW62CCmGAYV8msKuTETswSRFVkzwfQcUao/S/mESafsczQqTLXDN5/FTYfVEcAbwydyLD7cyN39DoA0Kzb+tGAgVdVc6Y1E2/OORcxPn8IAF509WsgvW+J1vOTy+YdiTwKlCUrBO5Wt6ja++n2UeGsMfRznSuBGWJ52+PuQx5kZ5C8woYh/Ra1GpDq9AWWdxUbv9ZP5PE3JC7sjCe0t1M6jop3FRWfo4vDTQSv17yfu06OtMGYe8+6/JksycDuIh50ib6AZ53g/TbE5zjaqWcuTNETlZkPHm2XEESUXfVgG1w46ILd7VKNYjWvZU+m4+O7hIajYDBYLa+ch1a+rjDHFl 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)(396003)(346002)(376002)(366004)(39860400002)(136003)(230922051799003)(451199024)(1800799009)(64100799003)(186009)(2906002)(44832011)(5660300002)(38100700002)(86362001)(41300700001)(2616005)(107886003)(6506007)(6666004)(6512007)(6486002)(478600001)(26005)(8676002)(8936002)(4326008)(83380400001)(66556008)(66476007)(6916009)(316002)(66946007)(36756003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?GVTbUcm9tsMEKORWcVkHryARpAejAYzhrDnqotELHxNa251uJgwQHmvLR0yS?= =?us-ascii?Q?fQLUFLjInLRdAGfU0sNfSTXqzdZCKo+20WpAn4KSUeCZZOj6+GkEPitMSAd2?= =?us-ascii?Q?uoaOMPcT6Pz+OSwn8w3WXftXZdxLzzEsggWLyBC2nDcugYVnYW92eeVqj6A3?= =?us-ascii?Q?h2xLh2A1AtoEdE+Lvzs9A4CwlS0q7uNgrSEHPr5oyNX60HKZ2Zx5LcehfcYK?= =?us-ascii?Q?pGZVh0tMTx4ddr20AJuTTsJ4nqsnm/mniQ/mbDYS6p8QW8ay+pj4r6hLwPKY?= =?us-ascii?Q?CpWUM5yP57gASNJgx7EagJjxSR8dVytRpsSyKqwWDmdq8KK/cER6wl9ipb1G?= =?us-ascii?Q?3XYuOG4hXlyEmic8svN9YtGKtkEW72goRMOe2JmEsdJaEAAwNq3AppUMGzXU?= =?us-ascii?Q?RoSNbO38NINIIYry994azfGHMsBzj07kWCWq3G1wIGvirwVhpAKwhhenCrIN?= =?us-ascii?Q?Vpecs2Gwsv6qayhJ1j3ZThFqZgP1D+nCJVUxIGN4MjhNomp4T7ZbYgSiwjTJ?= =?us-ascii?Q?Ph6Z9Qg3WW0hnaoh1XAxpDoQOzPUvLzjeBENYjWVxqZpMb6fTQy7oq3sGW+R?= =?us-ascii?Q?+8SeYq7jbYXWYb4R70yN7vooqpfA7AwA+HWphWHRoszOFtArDcyD4MsFsWnk?= =?us-ascii?Q?HDwE39hj5sbPAjebBQ2BLpQS6ZcjXGZvGH56pYPqiDi6I9sLax3GqR0y6Dhc?= =?us-ascii?Q?6hQaFDb6Qv6HhLwoztAUiHk53LVPc3nwtuGZwBrpz4qAFlkOSr5QOK4d0Dhy?= =?us-ascii?Q?9lSVqmZpF3L93natTJNitgZTpgEJEEvPyefY7wSdllapbPvLkFJT81jO2bRM?= =?us-ascii?Q?zWzPGE4BQ5xYefXdeEWsBHcmTHoI5oDuTRFHB1Fxopb4vaNPaij7iL/0HVxt?= =?us-ascii?Q?HtC3WTKBtqOW+g/YCJBeCvnVsTxkEFvSi8qjVsfyYWyDROUbdVN4UZGakiIg?= =?us-ascii?Q?nQ7XmpTnLSBPirYj+k0+BNq5Lv012trD3tt+4+pP8vEIRbUPLleM2qURB+TD?= =?us-ascii?Q?6+ZiHpiWsXFGVvUBH9SDBE0uguEBRbkoLQasJEKHBDLEz2+quKf+wp9+8yb8?= =?us-ascii?Q?/zk2c78PL9hacBuzXM7h4fsvExBvmUKyF7B2cV9Q9IzUrWGXfmHKp5cIQAXX?= =?us-ascii?Q?MLVVNK7tvDLEz4NeQe1NaFk17OlIxjuATgUhmk4Vjaa29q3etKuYR4r1L1Pr?= =?us-ascii?Q?/fn4apFwNPex4ynyDDIVRLSZDiViGLZi+vODZXS27hnw2MPkR0QKBnJ+emX5?= =?us-ascii?Q?oxg5y4SUWVaifugaXccSx8vptkXyvSyGzCYGj01zzrmcYNlk2uGFs6MNhgjU?= =?us-ascii?Q?WLTtw3bT4zGWfnZG3crslNxQgXEH8OpnYvwBo2PjeL9Ii29Vc7XaxFtJ94va?= =?us-ascii?Q?R99FzcXoF8M8JpvzPwKa1btbe71459qUHYh80M7+3m4keScC/2OedQik1GlP?= =?us-ascii?Q?ohk7L/x/xhdX5P7V+ZraEYPY3vdhLvAiwkn54pk4qdpjt5km1dftEEVAv+1c?= =?us-ascii?Q?r8X19oel+M5JjROUwgPcYEKFhp+PIjms12uL7oC+O9Umob5EFzGfwittDSmC?= =?us-ascii?Q?5Jer0RC81Hsz3xvKaYGZPti8msmwtX21O/E4tRPB?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: a89c462b-406e-43ab-37cf-08dbe4fc046b X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Nov 2023 10:25:26.2348 (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: 8pCfue8yquiqfEko44NsVjqiKvn/fS29VWX28Yux0W7/iXyaFGSfeslD73VLWkOUuoU4Ymb5lMYpvvkeRIEjkA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR04MB7946 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 ++--- .../testing/selftests/net/mptcp/mptcp_connect.sh | 5 ++--- tools/testing/selftests/net/mptcp/mptcp_join.sh | 15 +++++++-------- tools/testing/selftests/net/mptcp/mptcp_lib.sh | 2 +- .../testing/selftests/net/mptcp/mptcp_sockopt.sh | 7 +++---- tools/testing/selftests/net/mptcp/pm_netlink.sh | 4 +--- tools/testing/selftests/net/mptcp/simult_flows.sh | 3 +-- 7 files changed, 17 insertions(+), 24 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/diag.sh b/tools/testing/self= tests/net/mptcp/diag.sh index f646fede9872..f93f5bdc49ad 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_ns_init -ksft_skip=3D4 =20 flush_pids() { @@ -33,12 +32,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 683172e626b8..3d03e3b82eed 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))" @@ -132,7 +131,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) @@ -229,7 +228,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 3b92a0b78605..112db64402f8 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 iptables=3D"iptables" ip6tables=3D"ip6tables" ip_mptcp=3D0 @@ -126,7 +125,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 @@ -135,10 +134,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 @@ -394,15 +393,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() @@ -416,7 +415,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_lib.sh b/tools/testing= /selftests/net/mptcp/mptcp_lib.sh index 5c32fa8e91f1..2a37b564700a 100644 --- a/tools/testing/selftests/net/mptcp/mptcp_lib.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_lib.sh @@ -499,7 +499,7 @@ mptcp_lib_ns_init() { =20 local netns for netns in "$ns1" "$ns2" "$ns3" "$ns4"; do - ip netns add $netns || exit ${ksft_skip} + ip netns add $netns || exit ${KSFT_SKIP} ip -net $netns link set lo up =20 ip netns exec $netns sysctl -q net.ipv4.conf.all.rp_filter=3D0 diff --git a/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh b/tools/tes= ting/selftests/net/mptcp/mptcp_sockopt.sh index 2d5b6ade7df0..c8d08521c552 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh @@ -3,7 +3,6 @@ =20 . "$(dirname "${0}")/mptcp_lib.sh" =20 -ksft_skip=3D4 iptables=3D"iptables" ip6tables=3D"ip6tables" =20 @@ -74,7 +73,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 @@ -83,10 +82,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 e89b78e7d4a0..d68353c18996 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 ]" } @@ -36,7 +34,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 trap cleanup EXIT diff --git a/tools/testing/selftests/net/mptcp/simult_flows.sh b/tools/test= ing/selftests/net/mptcp/simult_flows.sh index a598deaf890b..c660e1f8547c 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_ns_init -ksft_skip=3D4 bail=3D0 slack=3D50 large=3D"" @@ -33,7 +32,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 --=20 2.35.3 From nobody Sat May 18 12:05:10 2024 Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on2057.outbound.protection.outlook.com [40.107.21.57]) (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 B4DF118C1E for ; Tue, 14 Nov 2023 10:25:34 +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="QsQgs/PS" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GR3nH2DRsrP58c7H34ns97cPi0wh0NH50K6hxS2yM9YotJKeFfW8H+zX7oJ0AOjIpm0aJKYaHqU8czyMfd+LMr2J6a10SBjAM6vHDUywY03H6D4VkghrX62Ka6nDVYq/YnuPP7+lSrzDXRZPf3wamHhbh0EKsbpzkYhgXyGs+Cq91EcO8FrRalagdg9hsTdyqEvXcAEQpmeK9loA0QYq/QXrcwj/vI/M8NfpmYKiZwam3HSn9GN8WOVHIiTXGbitigGEH765QG/m8SxDxYXFRw5BwxYNNZ7HCt6WkTBsfVjyQ8tQ8adqLmvil3REt7ZM4/nsDJWYEqAQ7SOJRbloyQ== 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=REVfFsoMxM5W3bfwncBbfAOpHcuaKeU03wO/aUM2aCo=; b=Fq7wBFr0+2wupLdz+rxRO8K7AzoRlj3Iw/zElygQOObg00t9ALfCtiNA3P/lEur3b+Hbt1gkvyCfYX15hrkSGrd6/IviE29G/sZ3Nk+2MePJYbW8MxpBIeXyyre665ezpeeV6KrE9Bt/kJgcJ11/PJYrV6SCVzcq+kGal/wE4yT7CIClYEHMVbLNamE9sP5+/uSNmwO99ng5vJcgKr9uU/gfTdFyEtVYQ7IwuWq/wtw1p/JWQ/uSg/J8l/8GOwpnHa6QZ3aVOQ1sHw2AmGMOTYHMQerdoeerDJmY0638JbgnZJrfuoOVc7IdCPmq/SSMQJKRgJPTwtgQgttXD+gPCg== 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=REVfFsoMxM5W3bfwncBbfAOpHcuaKeU03wO/aUM2aCo=; b=QsQgs/PSZw8XnB1vMWZWuRz+PLR0Czb173scnho4d/bLddyNc/KCGKIc8h7U6CZgwSsq8wsWudkGiPRfo9YClvy2OMmnE4k100SCzxIUitrHZH2NRFRLsUaZ8D80zn2l3gVxGeBNxJqRqCAYwEcoPaiGrm40c1HHuXlxItWsi0WhIOn4YGVWcVYeXi1lrwjDSwULa2cTF197U96zTAG2YA7euO6Nc+9BErho6h/e1LJyQU/z2/8rNa8mEWgsWpClflXSV+iw8XrutG4n/VbAz2gD6jd/6jKr4FLccoNlwlkbpxIi3y8/xTxp20b3vScb1Z7uYqifrTGti02/Pjtw9A== 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 DBBPR04MB7946.eurprd04.prod.outlook.com (2603:10a6:10:1ec::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7002.17; Tue, 14 Nov 2023 10:25:32 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::7102:259:f268:5321]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::7102:259:f268:5321%7]) with mapi id 15.20.7002.014; Tue, 14 Nov 2023 10:25:32 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v3 33/33] selftests: mptcp: netlink: fix positions of newline Date: Tue, 14 Nov 2023 18:22:03 +0800 Message-Id: <655640887b348c214b4bbb734991c695b23964e6.1699956980.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TYCP301CA0058.JPNP301.PROD.OUTLOOK.COM (2603:1096:400:384::7) 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_|DBBPR04MB7946:EE_ X-MS-Office365-Filtering-Correlation-Id: b812a292-5d26-4a19-bf1e-08dbe4fc07c0 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: sD9lZJaiuLOHP7Kwedkl/YW0/W1veEN4IjoAjLd311++ipbpHD/LqV+yle+NhodwwmU4C9OQ1hTtoL0OwHMnsTWHzoweG0ZiMCBqIiIRyA5Hs23Lh/A8Jfel7/RuvWkMG4TO7vSb/r6WjQ8I82GvMFnKJQGe10Nlta95XhYxSY0L/4lO6LHxKXugbGdLhCLU8ArMIWh7mnwuht6ZcN8Zmv+LlRN+yPO6WJxjcDV02j0c0HWckt77C9DHUrocEvLrv0qG0KSMSgiJ6y5Q/JeKosYbbfKMWo0YxvyB23EBV0OT2rcQBtMaACg3rD++VgUAoo+uXOc35gjRcBikmJeWuZFRIXlKmqIoeIDQRYCItsOGVgkk8rLfn6YCQ7F6s5dh1GlWynNPtMIUlhVu3qwSlD2SIBXEwBBbF+8+wD93YMSbjIRrEDUOAnGTAduIzUes1M3IhhpdB4hvlfQl3cbvu2qf5z6ffwXaRN1s7jLa+tKiZPdOafyoqG/kDuyJlcDNI/u8fivfavUmfo+uUuy8RSL7BGa6kaYHHPqy5YyhHSdIWDn/XgjqEtN6ir7RdoZC 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)(396003)(346002)(376002)(366004)(39860400002)(136003)(230922051799003)(451199024)(1800799009)(64100799003)(186009)(2906002)(44832011)(5660300002)(38100700002)(86362001)(41300700001)(2616005)(107886003)(6506007)(6666004)(6512007)(6486002)(478600001)(26005)(8676002)(8936002)(4326008)(83380400001)(66556008)(66476007)(6916009)(316002)(66946007)(36756003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?Bq9C23VLlkNPTRVNd5z33bFFoSDy3OXGUN+rwqWLvhH0Ve0T6IEwIvZWtw18?= =?us-ascii?Q?WHWqImdyBSb0tZW4WK92/bJDBRFDApJy1aIFdRoXlZWwfLTNNgU1A3C7gWqX?= =?us-ascii?Q?I/zNbEyREAhk/DMgjfavXNWcKO8PVRIC5xlMSO0wBBGpx5eU2xpbPA4NHqlV?= =?us-ascii?Q?7rEdWFZT9StVymwUaavl1ZX35Tt+gzcaRqC4eFujFNxebJGtlpcRnbgCAhGu?= =?us-ascii?Q?IiQAtYvDgiRblLpX/htfXsWJsQ5SSjHMu/fFBfy1UhFbSC/emJjNJmAmasz7?= =?us-ascii?Q?gawFGZV3VhW6a/ElJLEu35vlDHvH1XqYhsxDJAMjEPpx9b9/Umgi0viou/2e?= =?us-ascii?Q?8x6CKLcbUAss8BBHe/iHVQ7P94L5F4j5UFTMyWRI5owttg/W4dD+MzDwuIEa?= =?us-ascii?Q?ZazxlzZIp1g0pVPiaC22UZou2JR/BxO3z61x8nJIWWrQqPObmg5ICmtuBJt4?= =?us-ascii?Q?EMD9sO0DePD81eZ4Y0ddsrjJ88KTM18rOlkxkLhd1r2fvqzlvJ+GynRbkxPQ?= =?us-ascii?Q?VpMt0Zwl4fSp+Qgn71bm+zi9rbeiKdQ2zLmSJYCK2XkDZFMGZGSmc+/+obu8?= =?us-ascii?Q?EhdgKiFLUYBTMRtc150AB6xFt+k5VsYAUfA8tUN+LLZ9Av+Y8kmS/Y+sXRk0?= =?us-ascii?Q?zeQO+D7WgiLah04VkXFMHNtcY/VbSilUp/ckYlyfNOFq2nZPQipQeh2qhZon?= =?us-ascii?Q?AueTlZrudNQ5BpIjERXvN0sFAPub/GhLdcMUAp/Iq3mppCmSzxkAlacmhstq?= =?us-ascii?Q?K92jM6asVI77FV6Y6xNJSx4EQf3FWRhNsGP62xV03iWHBPvIUeHndGOUPL2+?= =?us-ascii?Q?ACp+wwGgCqYEkW2XiOXoxi8zRfR/xhPA2uu7pdrMRJvd5FQHPsY4Exs9SrdO?= =?us-ascii?Q?tzrJSPPw0A/5IlclNTOvhVvW27GeCM/+jZAlSP3bAiqszRh/pDT1vXU8TSjN?= =?us-ascii?Q?u5E4jDRxIplpkJ8ZKsAZnLP0UDhRDnw4+Sh6uRwmbllOipFc4BSGxUBpF7wh?= =?us-ascii?Q?7RbdK5fZfL9nHxDOAcRIMTt+ZKF8Z/5DH5ScNklReKFmRfjuKFvT9Is2v+IU?= =?us-ascii?Q?V9Xqoz1xpdpBKVuxJbQZj4vDQsNKx0os8rhlw2+v71OI450Degyx0wDLDEjB?= =?us-ascii?Q?muIBTfQYibD/NoHTLcW5pzETyjD+eBOWU7HR9HBHLaifUGiP/LoK/eIF7nPK?= =?us-ascii?Q?DqIGA66bWHz24Pn5owVdZ2y45x4hZyraxJe4uld6dFJA5Ia2Sga+OQgKzGot?= =?us-ascii?Q?4cA4SgCXJYKFDp5b1oBi4bfqk5flLR/gMRpdzEOHSwBS43O02VP16gmClsSw?= =?us-ascii?Q?Ir6p8IZBdxvUTAIkckJb9jpM0ClbZ8eNdVYwdl3bnQ/oplriWAKL0xed/JZg?= =?us-ascii?Q?QpeBLz6YQlolFdIUsME5GOB2UJGJ9EkcHz9oGRhvpRmb0BtDWyDUfaYNKslO?= =?us-ascii?Q?PG15LK1wWGISaxzb/5+YfJFefkdVqZymji1gWPFaIPQVFWTct3lklRuVOfsy?= =?us-ascii?Q?od6fTR0hm1i45aspSQfm3l7e/TzbubyNoJFT33Y7LoovUC6qjkxya3ujZhhz?= =?us-ascii?Q?HXPPSMI0vJzvZyVt4nwIcIl2Mw8YRu+xK8y7JlRb?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: b812a292-5d26-4a19-bf1e-08dbe4fc07c0 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Nov 2023 10:25:31.9711 (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: 9MIN52xlpsFLUIwClAkxqN9m4svTdJNcjAY0d3sipY/WtSpe2FZHeqGkvjmaPE8LlWO6XpMbaG6WJkGwyrKLBw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR04MB7946 Content-Type: text/plain; charset="utf-8" Some positions of the new line are arranged a bit strangely in script pm_netlink.sh. For example, the output of 'pm_nl_ctl limits': "accept 0 subflows 2" "defaults limits" This one can be refactored using $'...\n...': $'accept 0\nsubflows 2' "defaults limits" For longer output results, such as the output of 'pm_nl_ctl dump': "id 1 flags 10.0.1.1 id 3 flags signal,backup 10.0.1.3 id 4 flags signal 10.0.1.4 id 5 flags signal 10.0.1.5 id 6 flags signal 10.0.1.6 id 7 flags signal 10.0.1.7 id 8 flags signal 10.0.1.8" "id limit" This one can be refactored using "$(printf '%s\n' "..." "...")": "$(printf '%s\n' "id 1 flags 10.0.1.1" \ "id 3 flags signal,backup 10.0.1.3" \ "id 4 flags signal 10.0.1.4" "id 5 flags signal 10.0.1.5" \ "id 6 flags signal 10.0.1.6" \ "id 7 flags signal 10.0.1.7" "id 8 flags signal 10.0.1.8")" \ "id limit" This patch uses such methods to rearrange the outputs into different lines. Signed-off-by: Geliang Tang --- .../testing/selftests/net/mptcp/pm_netlink.sh | 80 +++++++++---------- 1 file changed, 38 insertions(+), 42 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/pm_netlink.sh b/tools/testin= g/selftests/net/mptcp/pm_netlink.sh index d68353c18996..06446cec7f55 100755 --- a/tools/testing/selftests/net/mptcp/pm_netlink.sh +++ b/tools/testing/selftests/net/mptcp/pm_netlink.sh @@ -61,8 +61,8 @@ check "ip netns exec $ns1 ./pm_nl_ctl dump" "" "defaults = addr list" =20 default_limits=3D"$(ip netns exec $ns1 ./pm_nl_ctl limits)" if mptcp_lib_expect_all_features; then - check "ip netns exec $ns1 ./pm_nl_ctl limits" "accept 0 -subflows 2" "defaults limits" + check "ip netns exec $ns1 ./pm_nl_ctl limits" \ + $'accept 0\nsubflows 2' "defaults limits" fi =20 ip netns exec $ns1 ./pm_nl_ctl add 10.0.1.1 @@ -71,15 +71,15 @@ ip netns exec $ns1 ./pm_nl_ctl add 10.0.1.3 flags signa= l,backup check "ip netns exec $ns1 ./pm_nl_ctl get 1" "id 1 flags 10.0.1.1" "simpl= e add/get addr" =20 check "ip netns exec $ns1 ./pm_nl_ctl dump" \ -"id 1 flags 10.0.1.1 -id 2 flags subflow dev lo 10.0.1.2 -id 3 flags signal,backup 10.0.1.3" "dump addrs" + "$(printf '%s\n' "id 1 flags 10.0.1.1" \ + "id 2 flags subflow dev lo 10.0.1.2" "id 3 flags signal,backup 10.0.1.3")= " \ + "dump addrs" =20 ip netns exec $ns1 ./pm_nl_ctl del 2 check "ip netns exec $ns1 ./pm_nl_ctl get 2" "" "simple del addr" check "ip netns exec $ns1 ./pm_nl_ctl dump" \ -"id 1 flags 10.0.1.1 -id 3 flags signal,backup 10.0.1.3" "dump addrs after del" + $'id 1 flags 10.0.1.1\nid 3 flags signal,backup 10.0.1.3' \ + "dump addrs after del" =20 ip netns exec $ns1 ./pm_nl_ctl add 10.0.1.3 2>/dev/null check "ip netns exec $ns1 ./pm_nl_ctl get 4" "" "duplicate addr" @@ -98,13 +98,11 @@ for i in `seq 10 255`; do ip netns exec $ns1 ./pm_nl_ctl add 10.0.0.9 id $i ip netns exec $ns1 ./pm_nl_ctl del $i done -check "ip netns exec $ns1 ./pm_nl_ctl dump" "id 1 flags 10.0.1.1 -id 3 flags signal,backup 10.0.1.3 -id 4 flags signal 10.0.1.4 -id 5 flags signal 10.0.1.5 -id 6 flags signal 10.0.1.6 -id 7 flags signal 10.0.1.7 -id 8 flags signal 10.0.1.8" "id limit" +check "ip netns exec $ns1 ./pm_nl_ctl dump" \ + "$(printf '%s\n' "id 1 flags 10.0.1.1" "id 3 flags signal,backup 10.0.1.= 3" \ + "id 4 flags signal 10.0.1.4" "id 5 flags signal 10.0.1.5" "id 6 flags sig= nal 10.0.1.6" \ + "id 7 flags signal 10.0.1.7" "id 8 flags signal 10.0.1.8")" \ + "id limit" =20 ip netns exec $ns1 ./pm_nl_ctl flush check "ip netns exec $ns1 ./pm_nl_ctl dump" "" "flush addrs" @@ -116,8 +114,7 @@ ip netns exec $ns1 ./pm_nl_ctl limits 1 9 2>/dev/null check "ip netns exec $ns1 ./pm_nl_ctl limits" "$default_limits" "subflows = above hard limit" =20 ip netns exec $ns1 ./pm_nl_ctl limits 8 8 -check "ip netns exec $ns1 ./pm_nl_ctl limits" "accept 8 -subflows 8" "set limits" +check "ip netns exec $ns1 ./pm_nl_ctl limits" $'accept 8\nsubflows 8' "set= limits" =20 ip netns exec $ns1 ./pm_nl_ctl flush ip netns exec $ns1 ./pm_nl_ctl add 10.0.1.1 @@ -128,14 +125,11 @@ ip netns exec $ns1 ./pm_nl_ctl add 10.0.1.5 id 254 ip netns exec $ns1 ./pm_nl_ctl add 10.0.1.6 ip netns exec $ns1 ./pm_nl_ctl add 10.0.1.7 ip netns exec $ns1 ./pm_nl_ctl add 10.0.1.8 -check "ip netns exec $ns1 ./pm_nl_ctl dump" "id 1 flags 10.0.1.1 -id 2 flags 10.0.1.2 -id 3 flags 10.0.1.7 -id 4 flags 10.0.1.8 -id 100 flags 10.0.1.3 -id 101 flags 10.0.1.4 -id 254 flags 10.0.1.5 -id 255 flags 10.0.1.6" "set ids" +check "ip netns exec $ns1 ./pm_nl_ctl dump" \ + "$(printf '%s\n' "id 1 flags 10.0.1.1" "id 2 flags 10.0.1.2" "id 3 flag= s 10.0.1.7" \ + "id 4 flags 10.0.1.8" "id 100 flags 10.0.1.3" "id 101 flags 10.0.1.4" \ + "id 254 flags 10.0.1.5" "id 255 flags 10.0.1.6")" \ + "set ids" =20 ip netns exec $ns1 ./pm_nl_ctl flush ip netns exec $ns1 ./pm_nl_ctl add 10.0.0.1 @@ -146,36 +140,38 @@ ip netns exec $ns1 ./pm_nl_ctl add 10.0.0.5 id 253 ip netns exec $ns1 ./pm_nl_ctl add 10.0.0.6 ip netns exec $ns1 ./pm_nl_ctl add 10.0.0.7 ip netns exec $ns1 ./pm_nl_ctl add 10.0.0.8 -check "ip netns exec $ns1 ./pm_nl_ctl dump" "id 1 flags 10.0.0.1 -id 2 flags 10.0.0.4 -id 3 flags 10.0.0.6 -id 4 flags 10.0.0.7 -id 5 flags 10.0.0.8 -id 253 flags 10.0.0.5 -id 254 flags 10.0.0.2 -id 255 flags 10.0.0.3" "wrap-around ids" +check "ip netns exec $ns1 ./pm_nl_ctl dump" \ + "$(printf '%s\n' "id 1 flags 10.0.0.1" "id 2 flags 10.0.0.4" "id 3 flag= s 10.0.0.6" \ + "id 4 flags 10.0.0.7" "id 5 flags 10.0.0.8" "id 253 flags 10.0.0.5" \ + "id 254 flags 10.0.0.2" "id 255 flags 10.0.0.3")" \ + "wrap-around ids" =20 ip netns exec $ns1 ./pm_nl_ctl flush ip netns exec $ns1 ./pm_nl_ctl add 10.0.1.1 flags subflow ip netns exec $ns1 ./pm_nl_ctl set 10.0.1.1 flags backup -check "ip netns exec $ns1 ./pm_nl_ctl dump" "id 1 flags \ -subflow,backup 10.0.1.1" "set flags (backup)" +check "ip netns exec $ns1 ./pm_nl_ctl dump" \ + "id 1 flags subflow,backup 10.0.1.1" \ + "set flags (backup)" ip netns exec $ns1 ./pm_nl_ctl set 10.0.1.1 flags nobackup -check "ip netns exec $ns1 ./pm_nl_ctl dump" "id 1 flags \ -subflow 10.0.1.1" " (nobackup)" +check "ip netns exec $ns1 ./pm_nl_ctl dump" \ + "id 1 flags subflow 10.0.1.1" \ + " (nobackup)" =20 # fullmesh support has been added later ip netns exec $ns1 ./pm_nl_ctl set id 1 flags fullmesh if ip netns exec $ns1 ./pm_nl_ctl dump | grep -q "fullmesh" || mptcp_lib_expect_all_features; then - check "ip netns exec $ns1 ./pm_nl_ctl dump" "id 1 flags \ -subflow,fullmesh 10.0.1.1" " (fullmesh)" + check "ip netns exec $ns1 ./pm_nl_ctl dump" \ + "id 1 flags subflow,fullmesh 10.0.1.1" \ + " (fullmesh)" ip netns exec $ns1 ./pm_nl_ctl set id 1 flags nofullmesh - check "ip netns exec $ns1 ./pm_nl_ctl dump" "id 1 flags \ -subflow 10.0.1.1" " (nofullmesh)" + check "ip netns exec $ns1 ./pm_nl_ctl dump" \ + "id 1 flags subflow 10.0.1.1" \ + " (nofullmesh)" ip netns exec $ns1 ./pm_nl_ctl set id 1 flags backup,fullmesh - check "ip netns exec $ns1 ./pm_nl_ctl dump" "id 1 flags \ -subflow,backup,fullmesh 10.0.1.1" " (backup,fullmesh)" + check "ip netns exec $ns1 ./pm_nl_ctl dump" \ + "id 1 flags subflow,backup,fullmesh 10.0.1.1" \ + " (backup,fullmesh)" fi =20 mptcp_lib_result_print_all_tap --=20 2.35.3