From nobody Sat May 18 15:08:21 2024 Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04on2055.outbound.protection.outlook.com [40.107.8.55]) (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 CE88A612A for ; Tue, 14 Nov 2023 06:38: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="5oWKnYqt" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MZzcKIuToVArVRLgUT0etAqK/2NtJj4+SILEPuEwmM++hWgzMgb9HqnL23Og0TMExi+592fu9olyRN5bqpddOv3CTFhzSBlbNNdfva47MQkur82fYI5gRnhm5Gq6nUnpLILyipKN5BTEaGUgPtzfaNxoyyNbj7DvcTnO0w0lR26vDL0wePOtUPkAoBbsO2qMgxOZAh0TnsCmEDU4sYm5MgDxDvEoB1mBZBzFlnnTJZ3hhFPUPMXlYHZq8pJJbr+SWFiUN8Zisz1tBkBNiPUWfi69hJwcYHGSbnjIC2WhZyiFuoYUadC6847Ajwsa87f9RpiO2Bng1skjdGBUvTgtIQ== 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=R9mKhE/Vwxm6dXRRDBWPiUabAuNC/+f4sxaJZltspKCC7jMQcnSXe7lAx+us5LPjA2ppVk1ImW1W+qcG1d5H9gkJCaakXbzK+EpF438xhzs4GRoiLk6iqebjV9VY9w7zKKQUMzklGX5UOKF6pTonEuL6TxjJPkH5JVl02nGZ2OAYyoJ5mgsTQ+Eh1fKTjk2EOrLhBWVttDAEVMyLnsYnHVPh8GgoVn1pIrtafdlQ8Vs+1iuDC0cLzelKJVOucZfsvEtxXIcbJaNX54qWZUk8gfN0DdNl7r3jCFVZOXKuSSKANds13jWeU3Ue5ovMbLEoXu/VIziX6Ni1fj++PhQiYg== 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=5oWKnYqt+g7HTQynTQJUFKohhvK36lEt+Sg1qxDzJlcMLYgcbRopM7dYg9Lh7zw1ZeddPSkqFJ6QWgZHdb7aAc7AbJHEIcfX7ETENVTNxFE4LAqePB3Tbqpf5BvbjDDEzJn46RSwN2TuOy5s2SQlrTxK+8pGXqJIhGZDnIod3cX7UIZk6gZKAj7kn+Aa/nIryUpCcUKPnw85HIz1TCOSS0tL+J4pG3zPM+WNiXxuC1WGzfSKQk4oFI6/ypLhXgsJ9o/nounDFaPiGKFCIHjOHVciBQXgPMle0L/4ARW+jy4uW8Dy3cX1NZ/Ykj/b9kNSGicI/1mDAgyiF33BiVdZMg== 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 PR3PR04MB7451.eurprd04.prod.outlook.com (2603:10a6:102:93::12) 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 06:38: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 06:38:07 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v2 01/32] selftests: mptcp: add mptcp_lib_evts_* helpers Date: Tue, 14 Nov 2023 14:35:20 +0800 Message-Id: <96ec7a08b3d643cfd3aec8261bd3c6a8d1af75ad.1699943337.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI2P153CA0026.APCP153.PROD.OUTLOOK.COM (2603:1096:4:190::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_|PR3PR04MB7451:EE_ X-MS-Office365-Filtering-Correlation-Id: d3bd38c9-f2f4-453c-dd85-08dbe4dc42cb X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: h0/TaeTleBg35Mo+heD7TEm8l5ycqtg3E1WPI6H9mYaCvBShlXxHyeTjhx0hQUW2kaHj8rRHPi5uJqaDmkBe9Byqt1IQivtaEhP45Tw3BxW6712COr7tLpbSLkSai1n+DRHTTzZ+gVYJ6PK2+GSu8v/4K4Hq3FLNgTxMIKqmhhzOQib+XELSu9VF08kRZzC70vwhR/bD2pOTpPffGCu/9GixNvyDpkD0pt+cU0HQqkuEJVk4YSvWuDfHcm/mG55LpDBWMIJkS0WFlv1ZwO0QXn3JghA/mFejwgJC3mJ1F/Vv9c4u2n7w7tLZdnumSsZ5PfifWe+0tlBUx30VGTosf4IOWQ3AFIZ6SmGRh2ZqCxvBW82pVWu7utJItaXtB0wnVekSyh4IPn3ucJ5mXLY/hvF7VIEq7n8TdDPFnM2sX171K68wdyj7Wbic4bOtBEggk2/Jbzlfkr62okl3apKC/GS1DJOygPXVck4Gv7uMoGRPOulPUku/M+SfEcOSlvKhJqyhTp6Dy3AA0LOLkp7qEkTLsYeMDysIlLuwiEgpjEUahHn2xiAFMoOnvUo2Z8lf 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)(39860400002)(396003)(376002)(366004)(346002)(230922051799003)(64100799003)(1800799009)(186009)(451199024)(41300700001)(2906002)(44832011)(36756003)(8936002)(4326008)(8676002)(316002)(66946007)(6916009)(66476007)(66556008)(86362001)(5660300002)(6486002)(478600001)(6666004)(83380400001)(6506007)(26005)(38100700002)(6512007)(2616005)(107886003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?tQMJiSeptdGJCbbNtnxrQbaR9xA2J7LLa3qRmb7cNH6szSUQ8dLQwHf/c09a?= =?us-ascii?Q?+OCKNVP+6QL84vw5g7niEThoflULz0uCWR9NrJT2jd7HZTtefz3LMdqEfpr6?= =?us-ascii?Q?lsZjzsQeVJNHKGw/iLQ6PwIslQVN8sXqZjjmZQShV5T7YYnARP8EevCME7BK?= =?us-ascii?Q?b8TGDhR11M55tOprBuckZx0uAXcbMvyUswKEQalnQpr6vYaf52UORwSgk7xw?= =?us-ascii?Q?4iGkB4NID2GtSG+xN2jU8G9J+7uUCn7FDhnK5WoP9hhSGwEizd6ob3T1gUmY?= =?us-ascii?Q?KeI3kTQzc7apFjU4r96mMKNjMbxhGtY5I9kG2GPQZbD23doBSyS/fGlzer5k?= =?us-ascii?Q?J+7QqOSUBD2J5bih4CadE3hjW333iPUPpU+zafRXlFuHZBnEPDtqMVUZ2/Yq?= =?us-ascii?Q?fBu88G0fFtIXkCj+hmeVTIvV0Yr1LgGTvyKlUBv522afwVYgeDq6XBrVSvwq?= =?us-ascii?Q?oD01Rgqv3bZboX6SwEady3w3jkl4XK2Bzia+drqfMvd4nN0RJ0if4vhiWdbq?= =?us-ascii?Q?t3qZWD5sYEi4R+7aYPtJ49rTl9en81UX9cqGcVqlgjOPs20Vd+OJIrCN+EGz?= =?us-ascii?Q?xuwGeJn7cHGMHtxU5/ZsGnSWDqo6ym/uWcBtP73rBSSULl5EzCg5aXcniq+4?= =?us-ascii?Q?O2uTtbJYrOWCHxkxMO+YP5JZbzoVKJxc5McAyUJryc/ZTvMoLNIgvgxB1MJb?= =?us-ascii?Q?UdFAmJ4XgfK1kB/jRFcp8vwrDLxp9cX2tB9NHX0es3C4NEYiuz4mdaNsawNK?= =?us-ascii?Q?PJ6jJ30x9l+RcnXGNrgef6cp7fW7ciTvHC2FXplijRpgI9cnxktXqM8mDkF8?= =?us-ascii?Q?uPVwPI+3CvDeXhK4KqzKxYOlGzb3hm0bfBTZZWOP/fqsAVEG7MrH3AQK7G7U?= =?us-ascii?Q?cDTsjOKQ8znWcjQY26bh62XqAC6UHrJXPjPsJkrP0BWU7Ebmc/zahZZdvDMP?= =?us-ascii?Q?jp/aJ9xkyfB9muFp844SJ7aQTAN8t9wWS7qB7X2xM4mqdp2unqDGV2Yh6ogd?= =?us-ascii?Q?amj1rlQ2/PjVeC2Hxe/lebRKZlhS5tC+VJQjHv5SOsr7O+47N2C/MpI36tEA?= =?us-ascii?Q?UL2P/x509+2pmueB2DM4NAzpNL+AEoKTmlXtIjRmz24AdiKHLQ6vi5GleLn1?= =?us-ascii?Q?znAomM3uPaxQA95/plZztuzP3CGw84DC0sgs0i78Z5/zyTcyglp6VbMAI43H?= =?us-ascii?Q?Cx6wkOzg8RD4vXeMF7WBNJOA9NeWsFprZI/hE9vRWkjIJn/uJvbwF2tRJFhQ?= =?us-ascii?Q?Z3+ouLDQk9pI4EVvQyHXWYnmTN56mZvKPkP5iNniDD8wMXXFOCLpqWOXpR47?= =?us-ascii?Q?gK4pd5NONMqqT+qiQXZsmwBatw9qXfmmv6oThYQME47KOOj40+iUGmfCAYo7?= =?us-ascii?Q?vHhfEvRk+k7+87aUH0cf2Y6cBvfHEbVCwpu/0on9k7rEjLohkZDIvNOhmbhc?= =?us-ascii?Q?OtFwNhw4i2R9VV93kX14kiuZ0c/Uj7oUFTSh6LdFkdVLyXahSecukHTd7v+f?= =?us-ascii?Q?6Y6BO4P4aB1EJjGAKgaeTd0TdL9myScDqKUQdXwLLCDYJBdBWz0vlP1yoopC?= =?us-ascii?Q?K/raKexvaHh60KX+dLh1A9+Dtn/+GfkdCPSnKJinqeUl7VBkyL+vySWHF3pr?= =?us-ascii?Q?ew=3D=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: d3bd38c9-f2f4-453c-dd85-08dbe4dc42cb X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Nov 2023 06:38:07.0562 (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: L1RJ7zTWBnbKIYN+7x8Fnuu+cSroBqGW+MT5av8nD7sf6Y3wQN6Xcan0Bqngb8hWLUof29zfpxMtihyDplBKQw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PR3PR04MB7451 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 15:08:21 2024 Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04on2083.outbound.protection.outlook.com [40.107.8.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 64F07612A for ; Tue, 14 Nov 2023 06:38:16 +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="SOPaJhND" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=RkkQyBZjrDNN7b6HAlj9mAD4SdOlEkrQRaJmoSSrbnYHPLMODpvXmkxT/S3cX6jDsjYJdcnZR1/5LT5KwkcWySeTLnVdr0DybbSPUSJbMDPyRCYnj/8MdiF2aoHkRvjC9qr8a1N4YUfdaArZW1HVJQD7FYaTeNZTmWc8t3DTymxBjAw2sLJsxWQZtdrRyhj+7cPPW8f0s8zmBGW3gGvBYrGO9wpsJ0VPi4U860QglezhYobPwkbInQs5npwg2B11TVQ4FFELBgHlsV6cFXnGIh8Z24tvkm/ZSKdaMjzZ7AB2REirEB7lUGpcBr8oaQ9h09L4VA1qQeVPrtCnsJQl2g== 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=Sksz4w3a1SfsCyHJEPMU5RpQxFX8XD5PE4GvzYFSmt1KNF6uBGvlISoO0OveoP24q2spzc9P2r5sTlitxWjFDfTQEscp+pznzH3CxML3isd4wgzI4MmbfLvCZYsufWB2x0gYM8A81KUlq2eRiuPiPPYcMVAhQ+WX8OnUr0KElJX5jQoHmrQmH/ijL0XnCMOM1HKEDQ0hinMbyT5oLyru9nlEnaJYCuYv1aCChRZQTSTKsbbFvCrFPVK1/WjSpp5kvo8G3QAEiKdNCdejuVuXPf12Fe9kcp7MZ0toYhu73HSfEIGOfqyZczu5i/FK1zGcSZXK9Y4+/F4MzSYB/Ef6qg== 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=SOPaJhNDV+j9Uk96GKoJDbocY34x3fq36VNEvuydtys6EHhZbIe8VINDYdAUoPhhRrSy30D+4du/x8mclh79WKz+VGnXGodghyWUgXppxJHUWzJknNRucO2PE8OFdOBZnm5bZ/t0ymCv8wYpphWH6FKc3rbc4s6wqmmFN4cZzq7myfvWCE2UVt/d2LvGLvnaVZrmHtSLgrS5NO155ximdBPvlHPnetkTIKz5bGcfgdPUMT3iTlI1/iS5DrgI4ZsL5bDwyO9syRdTgV7a2hHPfMG7LZd946NeITj/NCq3s31Wb0DrSMdE83IbDOiW0Wk5bXaE1eL2JxLNUXrkurZE6g== 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 PR3PR04MB7451.eurprd04.prod.outlook.com (2603:10a6:102:93::12) 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 06:38:14 +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 06:38:14 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v2 02/32] selftests: mptcp: capitalize test_name Date: Tue, 14 Nov 2023 14:35:21 +0800 Message-Id: X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI2P153CA0030.APCP153.PROD.OUTLOOK.COM (2603:1096:4:190::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_|PR3PR04MB7451:EE_ X-MS-Office365-Filtering-Correlation-Id: 19320109-dda9-4f50-8134-08dbe4dc4701 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: or2r/DafmZR2Qr302zgI3gsDtk/Aay8P0HzBOXk0/dy31avoNzdglVf5y3b+ojyWWvG7e2rYyAxJaeHEocy6OMhOaEfXgHm//uULxUPeFEsbAGDGiYYMgqGaciHCIfVRePVJ2bB12NiflIw4voJjzsOIrvmPLKAoN3nV9S/el0zCnWmWo2mWEPDA0tmuqJat7CLXx5/P1X/8g5FF7B3eS/efV6h4dx6gYd+lT3s3C4oxBgsxx6iVtWEUAzXPlcpJ5bZ4YzgXeDcQh1vBzXb0aFS+GlCkIfAt1FTlKfRwM/kTuyxsJvfmNOKniCaScKnY3NVe9AO98L9k7znBYVF9QlM0DPpWiQhCnNiWl1AxjV94kQKt1ATBfx7r0Eldob+7gkxU3fxl+840w0NS8nJ9svAkE9m8VxrAk9ME/uy/2lhMCdfcOL4gSpcMLFhuaia7l3RkYdiFvtXkfoy8ZxwQCoB+yNVzy4P87SsZdcoWAFGvtYkhY9xGELCIxmywdLoikFtURmKZy86TqsdB3WijegHEHqVIqs5FGJEbHNwNROwqLhFxic2O1wprzV9ER3bV 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)(39860400002)(396003)(376002)(366004)(346002)(230922051799003)(64100799003)(1800799009)(186009)(451199024)(41300700001)(2906002)(44832011)(36756003)(8936002)(4326008)(8676002)(316002)(66946007)(6916009)(66476007)(66556008)(86362001)(5660300002)(6486002)(478600001)(6666004)(83380400001)(6506007)(26005)(38100700002)(6512007)(2616005)(107886003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?kq4VAuTJblKZy4mUQTRaL32ab5AW9Ui9+anbvxoh9PZXuami0GNhvIbbXCYP?= =?us-ascii?Q?xmzv3ci5wQPqQjCQYVLygOacBPWIkndg9NYtaCf5d4QnJaqNKfyP6KDG5BMA?= =?us-ascii?Q?+TXGrAU4xBQwHIxbLxha/+AbN5yKXhgItii0B2nyvrhZPhTu7cYbwnF0ttD4?= =?us-ascii?Q?8vyQBRPTSqouaavxIgQtUNm773K75BamgHEXHtC64IGiql0l2YYYo0sUUr0w?= =?us-ascii?Q?giWiUv1Iqhw4WsiY1FLAk/Y/dLpbO2FQq6vZNuahAunzKhhrveMmVgshbhE0?= =?us-ascii?Q?ygch+Gr8YvSepnR+nUnFRDYuMHNHAk7JFssyW9nAV3g791jU/2DGfHpwc3EW?= =?us-ascii?Q?fqYMvbjBTquAbDvV8iB2LRsGclEsiyBhJb5jxLh4afuJtYuHrfJlOaCNSWr2?= =?us-ascii?Q?4PJclqbda2xqMq3dtk1GAc1y9Qx3lWuFU2OGPtzHVvTmH4G/EuBGTSWycZW0?= =?us-ascii?Q?6WLq3RVDuC97nO3ynDHzj19gbTG0RvDO01SoIYW518IUllvxIavrw9lyTho5?= =?us-ascii?Q?wK13Mi79bKB+NiNklHVWkECJ8A7r6/2gCKOHnXhTycnR9Z8yciprSZuKDtDT?= =?us-ascii?Q?WiL8UNm2q7NonM//F3jzfahInlilLsFgPfeb/7ZuTKIwXYGf+U9N7tck+NCx?= =?us-ascii?Q?y5jFeTXwTeyJjSU0vX+tiajpy6RTPubDhFFrApRX33aYmtJenj6+qWKthq1O?= =?us-ascii?Q?H4OqGZo5Syz8LqFL9IQ6OzBSjXpLsOl3VFSa/GZYm5fyPp8cW5vS7h8gYgYK?= =?us-ascii?Q?qEnWD0QL6GuHkW6B0uf+XVkhZHY56uWvLvn7TABomGoI6grAlpZtRosEizNk?= =?us-ascii?Q?drIQMoR3JFCDBGIfQ5nOX6S3e3BiVkO6XMqJMPf+2zaGW7rrBcOyRDVgDvly?= =?us-ascii?Q?ROJDLvJ0v58CoPkXcUQRKCPwkuvMCu8UHzYtFWKVKVMJDpjWezSalNSW2P3A?= =?us-ascii?Q?jf5GyUl5u5aV+y2oDKvSBVO0rHv/uvMdOOFOtYZFQ9t2f6wwK/DFDRoc+oGs?= =?us-ascii?Q?J/h+HDtbVtUi8r3UsM2VDhgYALFh3rDxHHpyN4coR4dp3SkCWCpJ+hQ+PeQp?= =?us-ascii?Q?Edsgvsv8H85lECM57v4WzfcadY9nVh3YsNsexeBJmDlxtNLfzTkxqMvAhYt9?= =?us-ascii?Q?dEREa7uB4CFnxFYpSLKTiQ+xAVK5iK6Xj+r0txoPfaZsbbS9BEgpoOO4hyEq?= =?us-ascii?Q?/vRMHTIbfgY0ofmTxtghhOqT0O0UCY+qWRIOrf72yfHCOi1zIq+yWO6BVxtc?= =?us-ascii?Q?UP+YB2YtyNuNYDWf9A7IFdr0n77uFsmAs+ld6scinmQ1soiy4a43R3la9E5L?= =?us-ascii?Q?r9XM90CSIcsakI6He2W9RLHJ6ErdGhis2T6uc+Uv1Ws21Y946KfQNMh7+kNp?= =?us-ascii?Q?a2/ygXeFjPbty6vG4CoqMCrNzd0Gi/tLPMuOn2BM3/qHlShBL8rj12Zy4Qvl?= =?us-ascii?Q?hyFmrVEhF6Iig+KrCku3YoJYlQJaiEzRlMXJeixTs7FmCnTmHYSQnXNM9RZr?= =?us-ascii?Q?6UXvbvST40YosWhioppHq238NSYkKHIeQPPfbEc0qhqFIngCLR7kiwDIp9N4?= =?us-ascii?Q?HMLMvlcfUm+x/++QlOrjsbRLJdKJgHrYrqtX/t5k?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 19320109-dda9-4f50-8134-08dbe4dc4701 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Nov 2023 06:38:13.9747 (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: 9+bXZKkzq+za0Ch1cVKuqmwL7H+O34n9qxqrdKYLMVX3etkQGsAvLUCzVvH/n7ayp/zb5S7hV7SB/ksmGR466Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PR3PR04MB7451 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 15:08:21 2024 Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04on2050.outbound.protection.outlook.com [40.107.8.50]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A9CE7612D for ; Tue, 14 Nov 2023 06:38:23 +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="13+I5hro" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=D0DovCqqVtRPtp09xY2bNzcbPfajsUPNNbW4RY3ko+PKv//XuZGU3SJPQg742r/ncJfwc4q1nmZ0zHtgrfbEffBFY6RbmqkeMOmZsF+R4XbIh9FWliN0muUxhstyT2vMSKhcdkL6p35jpf08KhXid08t55jysZZjAsxdru3ABLVtG8rL6af+IMQJGQ2X+Z2VyvBMhzLCET2lCV8j7WtIpKeOvxW+vfL3yoMTbB7Z7xSBUkS7alQeK6AyuVeVwT2FSrX9joT0+09xFy1yNt7EFlLMQpR+/UWE0GG440wF5+twEFoHTg9OHM8poR6Ut94BWD+3aV+IFN6m0Z60Srq9vw== 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=QwMnRP41kGXBQFdeJAfnOCYNF+u7DxtRReBGYbFQbQG4BB3XimE4AqHi4wWOYMaJHZD8kxPk176hd4CNo4BnYFeo7Edm0hrL6y7H3BaZeeKgvfdNOlpbl3pdPhDoNJg7t0jRzw9YVFOfuSmMoRlXHmIoS+7mqkxzrRRRMp6kWyuOrfg6+wolHH2DQo3m616SI7Qsh/hE8OrJSDAa5l86BqXb+lSD502rP1LkjLCCTxcNingpb+dkHJHycfC1XpEH56E7S2064pddIDNW1cLJoInm9NYFcVqTm3yvQmDsffhhTWnFbXrNrWP8V7a4OC5LJjGr17Valp9uSX+AGiHCEg== 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=13+I5hroIiCVGczlkHKy0EtFgyf0iJzaf6DVXiHL4WYCIztLZLBpSAvR/v1c+W3Wz9Ld3gJfV4Kj4v6aVEJqfFwzyCCwbu44fxHyZdbFvr4eDZYQvLBj+qNqj4IOTqdMGxMTmDZW80BO7V9ThUeb0GICv1k2rGewW3mZYC+bTLfq84CrlVh2Ny1zF765GV6BeZxv+lGGjyxC7gWoaxMm9IbwIi2WyofRJ6dyw05Ej64axKckHRhQ6M2rSHojisrFoFdX0kX4gFbmYlTjQg6+ufiF3jM1RCXr6i1nz2QbUUh4WM0aR1b7GAOJG9jGNamosA/mEMr14fhrT2+c9xhBVQ== 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 PR3PR04MB7451.eurprd04.prod.outlook.com (2603:10a6:102:93::12) 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 06:38:21 +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 06:38:20 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang , Matthieu Baerts Subject: [PATCH mptcp-next v2 03/32] selftests: mptcp: userspace: print colored output Date: Tue, 14 Nov 2023 14:35:22 +0800 Message-Id: <76a2aa1487406e12a01e9c3d26d3b9bf87e9f165.1699943337.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI2PR02CA0016.apcprd02.prod.outlook.com (2603:1096:4:194::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_|PR3PR04MB7451:EE_ X-MS-Office365-Filtering-Correlation-Id: 2644177f-1838-488f-618f-08dbe4dc4b13 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: s1XMPJRgrFGzINOT4H6408H6fkrk6WFZxrTPdAfbYDXETkaHiHidwGO5NoOqJ/b1hebkn1A4i1Mm5KT22vV9xLsabLYWDxWo+Ne/QHTFgbPTUfY1DkvGdEgT0O3V2lHy3m8T1gm9AcIKGd11QU9+GsJ4l0Q1+bjmYaxLKi1MzYbyP+6TUzIBjOv1NR5lUmHX/4E5O4sArhwOTikKLOSoC/CUt+tQg/dwl4RR9VW7/RJAGLxGcYnpEl/rbwdHHfhXDcJT+ftjkB23JO3EPk4xqvDwJPd590m8DAKcAuMgQuYc0DAHlshjzgecTKjWxk0N7Ot0zCbKXxZoZsXK/N+8oT67u5GDuHXLKYsDhbzITbNnXhsvkE5G+9wRHvo08BUDP5mtOlkq1IUtwxsdHBU+sxaPF6AR1LpX2pLwvWLpmvm6t0sUP6QshqdE6RR8yQPm/wH/QI8kokY++5PF42DZck8DA4q3t03jqtuFso6jr7dTfUSEBG+GESHZxdaoLZqrjEODGYj72WuAbuzYp4SfMLCP5cnVTLKXZDacIfoMgDUAhqocowx1+ucpPQMvGKCY 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)(39860400002)(396003)(376002)(366004)(346002)(230922051799003)(64100799003)(1800799009)(186009)(451199024)(41300700001)(2906002)(44832011)(36756003)(8936002)(4326008)(8676002)(316002)(66946007)(6916009)(54906003)(66476007)(66556008)(86362001)(5660300002)(6486002)(478600001)(83380400001)(6506007)(26005)(38100700002)(6512007)(2616005);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?9zg+qPScfRnbab5eq5pqB4K8GEYC6lBJTMY7vReHUE6auRLftsDZWW0+V5bA?= =?us-ascii?Q?dqw86isBouoiBo76UfZwosMUBnh6evTZbaV3RMiFb4wlLe9PiSVixkqbjD5a?= =?us-ascii?Q?MtmQNFCmKjF0FJm8KV3k4gURsiGBWRQf/o0minU8JN1LHQ4+Cqi8jUokIa8L?= =?us-ascii?Q?fAzi7r8Z/hzq4/VJFRQgT8Z6HnIpiSddPB+7vW7/cXgSSVUJBOcQQbYZ2eo3?= =?us-ascii?Q?60pe39Gk/E754zePjOdz+4jRhg4yW7JLMWfg1xOb5JOT8dimj6+ZRBFS1EFM?= =?us-ascii?Q?4i3bQ32d+56bHifvD1PWCxVtGX3C8vzvRtgh38dfYQawjHCdYgZJoI4Lwt3d?= =?us-ascii?Q?77YszcH5HNPUdPl12cHeqVH3fN6mronPDwX8SfM5P9KQ1CWzEkx5jvtkyY56?= =?us-ascii?Q?7pfdMk7vKk1a7qEyByWb8rNSDtcinFT5CyfD7xt7Wbjauj/WJhMaeZvQ0AL6?= =?us-ascii?Q?NDOe12BO83s237OGsWgQZ8l/Y4ULoWnKUUIQPrx1s+Q/itFZwMyU2saEUwz+?= =?us-ascii?Q?BbLJbyjQ2SbFRcxNmDIrw6FC6mMl8rOb34piQ+yc4HBRoqTrqC6hCmBbdBCe?= =?us-ascii?Q?GLpBxofW7I/aFLs6IMIMdluKvCKNF5KMp7OBsDtvQE8EQpWrMMXG6mGrSuF2?= =?us-ascii?Q?/T4pbTf2rYx3p4L7M1Rn9fiEbu4AvkcTl4gP6XyysK74biDFo8osFkSZmFkT?= =?us-ascii?Q?HDwtpAR6/ia6FXV2yE1y1f+KuOpaCw+poxtC1BT2LNAaeuVr9IJdZP0OW1K0?= =?us-ascii?Q?rdN/0zr3UGVb4MQ/hD2e9TSu18K0pMLEi6qX3per25otukl1DG1kd4pOFGrU?= =?us-ascii?Q?iedF1nYm4oIhnW3K8Akfoalh78SVCtP5F1lqfXsze04SLwbC0XTgKqyqtzR1?= =?us-ascii?Q?eHP/X34yhFYv++xCauFsTt/hrv5nO9kgNNflVs600iN/8Qe9RLNRmUWz1sGk?= =?us-ascii?Q?3U7i5XFeaWQ2Fb5skuECk1VC2YDhzWmSrDc+4dqf9Z2hDnR8mc46tFOum8Pg?= =?us-ascii?Q?aScYDCDIFADg61/TrLWOWM47cvYZCDtITESPGIIBdMNe2QzsF4fIDqm43/0m?= =?us-ascii?Q?q1nOeo+Eq7WAWz1n2Ru6/RHeqAROUD+xwImr1PwXWdY8DNz0G8hiMuXraGBR?= =?us-ascii?Q?qxkgDIDbs7GeAPZyKQWLcipGivc+ni9Z/8KHIafdmEqsDwL5Tx+eQZBoq6Q6?= =?us-ascii?Q?TqFLArIrL39v9Mol7cCmjScnTgqvu22GdA9th6lvTMQoZNPZPEkTTya7uL0r?= =?us-ascii?Q?So8Ex6bNkoVt7cRNsRq0qpbjS3oKP+QVtsYrPA16C6gmXadbzLGZnX4mUa9N?= =?us-ascii?Q?Ggm/ltEHh7wSSXm0eVlyD3SOP9oK9IJRKK9JEuyQLeR+VyUfbwJTLaOc/UFb?= =?us-ascii?Q?PJ1vu8Pi9wLLjJqyPZr41/Q8XTYozuYF2ACdmgAfX/HOOAaLsczuGmoVRkVc?= =?us-ascii?Q?f/QAUcieIj4CZq2YBjxR1nhHZ7UsMDBsX0plCOBx7qGkPF89Ufn6HX3tIwZQ?= =?us-ascii?Q?BBaS4I4BHG5+qyQokJ//t2IBZk2cYaNRZ1hQsAG6HdDxOSSyH+Erln0RkCwR?= =?us-ascii?Q?DR6Rj4pt8iKdT0CrOf14VzT1AYWRXpRyYG/qQ6Up?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2644177f-1838-488f-618f-08dbe4dc4b13 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Nov 2023 06:38:20.7841 (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: meAcZmZtTIx5yYZr2sJ5a4QAU4yZc/hwDD7//Eo3+tJiR9skX0LtbxwdSgX98RPB2lwqYcwbiPUHTaWkuJEjdA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PR3PR04MB7451 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 15:08:21 2024 Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04on2045.outbound.protection.outlook.com [40.107.8.45]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 487FD612A for ; Tue, 14 Nov 2023 06:38:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=suse.com header.i=@suse.com header.b="d5ZdujB7" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Bus4O/KxOEQ6Iw3tptftu2vPDst7FZcDkY7gOC50L+PD/eseJPbV9/x+lhImOmROdkyiKS0iR8ZM73l3F8TYamYsJ99AdUH1utsazJA/eDqt8jm9ClERtuU1z+zoZ37/hdpWZc8lKvI6VLlz9NhbYZDWfGS7WSMIY0ejbP5CDMc8FYHHdxEvKP3inATK3Q6UcNg7wwI9c7jG9OtEwUDEc2C4crVfcJ8qAEU1NQNp2LkFf1tqvPOqQRi/92J5+RqLpYAHSewRcxtg3dnKuSd7s79Z827XY/Mp5MLBomY31NddrYYHuuSFmJ4Argm6N36SSeWxmJjFIDqcIgtAVLwpkA== 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=M05nsFvr7CYn8N2nzoPogNCjljA9avfMdsk7b3P767V2QF8iI+1kRwDbXjweZ7NmJEdWtFV4AOdveEUvCeWyQovNp/mN4BcTf2cCjLtZVncWJPBQos6DVl0eJyv56F+AFMucilMZ1n/ieimK4zxVuIXLidD2hRWvG1HM6wdAW9Q3U9VvOGBm/S3NLPwYAYstm7dXpGFuKTus4ZxoEBSno5MGRDZcpixVHgLR3ohpSmXJU8aQbtu22qmhzDv7h6na6XNuCDh1wOt0csjytzjUIS3CqzVI+znrn6KGTC2Yszd3oEpsmtSo9qWFpGZcwJjP852LkHTH+A1e1ySfV0KV4Q== 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=d5ZdujB7elnB2qaWzHo9ZndUDliOEgHpoezgsEPpI6YfDWLBHv704rbuVdTcuGI9ei/P525YVYG9hdn1uGnAwqqUUhH+1UydbS3g2qXLGl5O+uEPzlmqnKuCR2bAcKvgG53gYBqZGCkkEUw8Hkp+e+HrJY7xTcdsvfadDi78UCBb/B2m/DIuZG7W/RdyAgbncC8Rdx1gaQYCKw+rS4zfTjxFuzSTzbrN1/HjPDsam2/vgkVHfNf3f/eLS++r7+rhJF7U0GkOc4wAdju+1Jlzsx25Jd/Xu9NswPQx0Fa8bxnv8LHwHeRpLHip8J9IShNnztkl7+mm2Ofevn12Tphpyg== 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 PR3PR04MB7451.eurprd04.prod.outlook.com (2603:10a6:102:93::12) 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 06:38:27 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::7102:259:f268:5321]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::7102:259:f268:5321%7]) with mapi id 15.20.7002.014; Tue, 14 Nov 2023 06:38:27 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v2 04/32] selftests: mptcp: capitalize ok/fail/skip Date: Tue, 14 Nov 2023 14:35:23 +0800 Message-Id: <95a9a4d7efb7f0bbcba7d73cc4159234653d9d4c.1699943337.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI2PR02CA0002.apcprd02.prod.outlook.com (2603:1096:4:194::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_|PR3PR04MB7451:EE_ X-MS-Office365-Filtering-Correlation-Id: 7cb416ae-e49d-42b9-1e12-08dbe4dc4ee0 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Pl25m+Sxb9s5ihcizI9pJ6hHLSDclS/MJXe2/iiHLGpw749RYjHsIhvbD+Tx6BBeslW3jOLDA2TFZ1rtIFu2yIFGQH7rL5T07eJLgIMA+joFMkHh58UN4JZ0AEwtCrzGFfI8hdDragggu79re0+3p/KcFkNRVLYmnmB7/syj54Ct0MuAQX1L1d0mALnOMkGnm+zo24cu9WUBD1EMAGJhc9StMd4COgsBPvtRwvJLZRSCM4KQiNAjcI/Qr1vWW5VLJdHTVHvWgXmu2QB5lRR1aktzt5sR2a/YeNXROBs6ovW9hgvFCR0qWrtf59vofbLyI2WkOGx8qYZMC0VjviC8haMJNlNSDLjoH1hxH+593DJv3/qenFVaeZcy8c6aFoOdM8HHAQaEQ17ua3QAqsIkzCKb6K0Qnod1tsgLR/KznTE8SJ8X9FGaaIKVyeUzpFh2pwvQHl9Quak9YK9cMGbHoZyW/lheDv5vmrxJ3ihVFLXgdSo+jw/v1XZVKSZhzGVH5mTOGveHZ1TYC2T6vJ2mECXbJhZsP7B8DYVJ9CiE5bElL2Y0lniH+o5OO2tpPIFa 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)(39860400002)(396003)(376002)(366004)(346002)(230922051799003)(64100799003)(1800799009)(186009)(451199024)(41300700001)(2906002)(44832011)(36756003)(8936002)(4326008)(8676002)(316002)(66946007)(6916009)(66476007)(66556008)(86362001)(5660300002)(6486002)(478600001)(6666004)(83380400001)(6506007)(26005)(38100700002)(6512007)(2616005)(107886003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?pzpGsbmNm7mMhcpHSMMv//LGtRnrjE+r/WS/i7rYbWJS+cRw9eRHIE+5L0ih?= =?us-ascii?Q?uge1pWFYxJWnW4C7SDWpmUzwKvPVGOxdqqzJFiBLCaFcf3WnqPE6nADzMUC2?= =?us-ascii?Q?Hs61xtKMOiWCCz/O2y1bX0TYEquE8FNDHZkxnci4v8NMpLg8PfcG39CXchzN?= =?us-ascii?Q?s7+tvsh0mZOlIvPfOqZ/v71sDhoBwjXBv1GGFepwXUlsotKkTHd7ZdIsyLHK?= =?us-ascii?Q?+mIlTYCKA2xYJ/AAFLGVuiJI2oeiQMllLIQgmiuJp6xIDYksrfRGCdPS8Uyq?= =?us-ascii?Q?hEhyVkkbMaWbPLgRm0+YeKadu1vv0sTKxmUR2wC77naG2/16spmJkdOXcEkn?= =?us-ascii?Q?QQWXlEa2tBqnxnMccwBj2MJoG8ahPYTkRIfoG8FJGLfIWZu6knPtf8HhY6Au?= =?us-ascii?Q?IBcXxJOwOPVdzN2bpkrRN4feEJeyjkUB2NkcIvijjzkZ95e54JXWQBZdKlWG?= =?us-ascii?Q?5Zv3hjxUI9Q2YWYbVGT2FrBJzXliXY/fzD2jRnX1HIJBdczHVXFtn6bloylF?= =?us-ascii?Q?lg0KKISPRh/va8eBa8msYSytqZfv7/3l89KbYr6QZsfMdqSfp3WLqcDcHrSO?= =?us-ascii?Q?5l8AmvsHtVoH2WoJN2eWRKPLKCP5woKQqUUc0nxMSdlRRrTxmDnyHSznfrVs?= =?us-ascii?Q?LppQu84I5M2N48mhihoC7pddnLMZUBeVNdesio6SFAO7uuFW43Swm02HcwJ9?= =?us-ascii?Q?C8BnlPooqvGf6qHtPGgXmcWn4YiPxm2XgrtDF0C/x2aL/G19PMhcrZJhjyaa?= =?us-ascii?Q?jXHqhMegceKKC/muSHTTOAd6Yh+2c5B24BImcEcfcSlvpuUum1clqvydpPR8?= =?us-ascii?Q?+8IcMV6G6DPPBZBXruEagWFdp7u66JBFc45kBJVLNhyhBFEmRtaRhs5oa7WL?= =?us-ascii?Q?3ELz50dv7veCZJQX0BD8sfoZp2vozlOFYGQHkHlCNQhgQHuzuy6MUCq+rI6l?= =?us-ascii?Q?qu9YnaM0o/txN8kp10+54DZQC6xsWnxD1axyuRoIo6JR6GrH9W1BVqEThUfu?= =?us-ascii?Q?U8HGAT/15vbgNNzyo3nzdmUOlDNdEkosQnS9vWkYTa86bHA35YgP6v8+iv7z?= =?us-ascii?Q?iL6x7GaDlPQ79akdjyGHUonQPUG9YEN614EOTmZaPwi1ln2hv7pyCT3bTQgd?= =?us-ascii?Q?MSePjVl0EXA3qrrqLW4U/s8pet3JEYIs1gHQohtQxMbNlserRkF0CS9Zhw1I?= =?us-ascii?Q?EBPN08Z4I+F1LNbil2xLfyt6TbgB/UiuQLuWciB82hQWsfK5v6Sn0S8EPtAd?= =?us-ascii?Q?wZ7dpMUKZ8+7c8DPUA+5sNcafiMgvytq4/s1cFqlibobgeDWblkvenUlJu7O?= =?us-ascii?Q?UZ2NyRECFGwE1q+eHI2Zzox9g47VBrsGY2a9WjmaKViCeD4+esLP28JsJh1w?= =?us-ascii?Q?9EqxymruXbIL0RqTexx2KFvz6cEeDxI14kmEklp96CfWLMNGEU+mWSVLzSGZ?= =?us-ascii?Q?bfo+iSmsmh1T4jxvVlwZi91tj8pkWpNADMEWD6UiPqfgh98CaHg/4OOb9Kfq?= =?us-ascii?Q?aEGdmvhg4tq2Gq1iBSfg+ul8EOPtIMieQYVgnXI+Cg8plVmfTzz1bVp11i11?= =?us-ascii?Q?+MpfdGEu5Q8H9LodVUaVUSJzfsQR5Hjnvy3S/Wsx?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7cb416ae-e49d-42b9-1e12-08dbe4dc4ee0 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Nov 2023 06:38:27.1770 (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: JpbFjgoCDux0zB5dl5CosqHlvCNBN3g4CeAIu/PIIcJ2hz325uPIWGfQiXsssFW1QiQzdujjKz1fuluLBT1dXw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PR3PR04MB7451 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 15:08:21 2024 Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04on2045.outbound.protection.outlook.com [40.107.8.45]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1751E612A for ; Tue, 14 Nov 2023 06:38:36 +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="j6RJ30t2" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FgDPBNjJSP1YBiOtzyvWUfcAAapcMyzZGS3jZb8ysfvkY0SHlYK0/0aJ/OZCnKMowEd5d6saANpCGsd0MQr53DmtI6wgihkZ9VuLlYmsNu8WkT/FqUxWy7UJgIk490C5hrM3whr1V5uiU0k7hUq/2Qu32x4m17WavZ23EMLWwoeTZgdcGFgPjbs+xHzSdKwRXeXZvvvOFfSfxgdA2LW3JQQl0hyrRQeFsIoRuSQqLMEMQrT1UTm6c1RpOalq2IiiLGQJmFYq8PxNtUD3buu6lty6r0v/oGsCh6pt5V2QpAuNE+Ran9CdLXFCjMpGgxtGY5cVigo9tu9CvlVyxdFaFg== 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=hOFOC53ZWnrdvnab2rOKlh80Dq6xpag3FJZLOoPI7jOqTpObiYfa+Q0j8Gx8fRnQCLqpHPfxLcDr542kicBNPxBgSJdgNLIbCCpN1e5P4bbVbee4XL/FSmGjzg4x2GKILu6kgKlsW+NYivfno9qS5dlr/MddewGF6S91EWmzkPa/vtny7YpLcWMvfQQqbTNpMaOb+JxiWzTiwWceljlXfQNNmdIhIuV68zi7OYQBrthitMStqzJjp/FVyFuFCD6++mjZzFXEdY8RXRfvUEIMz4//oxC3pYdPKpjF/zd67gN9QJL3c+zhQnuEYohjCCBa7gkCnfW+GwkEBy7PNGLQtw== 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=j6RJ30t2myMabsY2APHUo7ziED80l5K0HEL3nvn1AvvsXSUiIM08rBrUpzfgIWL45EQX1b3sWUD408IU5d6DQw9eAb0ICzhSQcnzKOEhNL3OGQCuIicqAi5vHc0lNI1YANJpuIak1AkbPXJzL4F/9wd++mIT6LkailEu0fUneB9VV+/EgrkUuxwJA3TWTGcZFS7/B3AtRMwv3rc6CfzdbZav4dsm7TAX0mumTF0yjlPyyit9cPo6OUSUaFaSRQlxV0Ng8Uo9rxEUXUQHcK5WSWs9Ulbc2i+vA2KkK1NySKcYRLC6z6c9MAHkaqTzEdHyghqfIARcSJcJUPsnCUlPlQ== 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 PR3PR04MB7451.eurprd04.prod.outlook.com (2603:10a6:102:93::12) 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 06:38:34 +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 06:38:33 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v2 05/32] selftests: mptcp: netlink: drop duplicate var ret Date: Tue, 14 Nov 2023 14:35:24 +0800 Message-Id: <585c4d4a72a6bef3e0b8fb99a93b2b434ce4b0ab.1699943337.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI2PR02CA0009.apcprd02.prod.outlook.com (2603:1096:4:194::11) 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_|PR3PR04MB7451:EE_ X-MS-Office365-Filtering-Correlation-Id: 53a5ef86-9e5e-483c-d75a-08dbe4dc52ea X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 31S/sKOuB8nJqZVlVKbfns2xBGdsVDNYAj1A8CLFsp6Ct2QXgz7eZuSs/eMjGseXvpq/qX+6VulyWYvVGvkmoppH1dr8Z7cz4yplMl1T1Tc/xpq4tiprF9hN+OSwkVbZXaNiSKi8adRI2+N1+o7siPAR17IIDdZucuVDJoeo5ewu0BKdZDneUwYG/mainqdklZ641WoNJRsVeG6pxQjZqM7BA+U/ApDauL4Am5ZaIwWszvmKLtsY0vq/08HN6yxYeWB8S452ahyJhCNl9YIWYuPaoryDykRk4VUzpt7E2k/yflNizEhFH1An4jS9fsLqrqr3OvJXxHy/NGK/SEs3idrgpiMoOiXuDjNSpm5f1c6UDEyuX8anzpMwcZwwsT0pFeLuNcks2qoazmdwYBeVxsLuCu6hF7CIp7T/XbTwZaF2MaxlxKNko64M/T2zCp0sozwbg6fwDBZA9DXdUlppEvoXvJ9dEa6JB4ygx9Ht/UPinmRcgdP4O4qGefyDajVGGjPpQi9KHCcQ7GyvvNcP+IQTWMaHYQp75HXdxID5K2XX1TbyHkKuIDEEmkzax1dN 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)(39860400002)(396003)(376002)(366004)(346002)(230922051799003)(64100799003)(1800799009)(186009)(451199024)(41300700001)(4744005)(2906002)(44832011)(36756003)(8936002)(4326008)(8676002)(316002)(66946007)(6916009)(66476007)(66556008)(86362001)(5660300002)(6486002)(478600001)(6666004)(83380400001)(6506007)(26005)(38100700002)(6512007)(2616005)(107886003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?W06DZUr3FCH3mBMcad8v1xn4/N3qt7qdyHoub5+6x2nLCuYoBBiH/xBCHvAX?= =?us-ascii?Q?MEJm68sko0ooohdI2ZcTpzhji3RCHr6NrDBD6CoXxiIMlB+IMAmhoSJ79KsI?= =?us-ascii?Q?VAdJv1rlZlnq2mOLGk74QZ0/KypYL1tYDbhyx782cPyoGEk8ErGMzaYHAvp7?= =?us-ascii?Q?JD/2chq/o3GGSmUobD7mwMOdBL/M5VZ5eVe7e8LNjU4hv7rnAX4i+46QNLxf?= =?us-ascii?Q?TLib5rbZ96FV1DS6//giXbA2ZHWi/Tb2BI2eU9paJ4StLjQmPx0opW/ZaMdn?= =?us-ascii?Q?1j2ThFVK/UMtzAvDOWFIihbasTNL9MFn01r26/NVXGIrwWl8Q1uEaXbMxX90?= =?us-ascii?Q?nYEVBBZVRmN5IJjaDFoWEAB66YYPctdKtwJah3Bpo+GhGBatH2JQOneZdkNW?= =?us-ascii?Q?BxjjYOFGhvllvdxR5xUOLSxhm3LMmYm2FERPXU1QPR0hwjIVdOeLTN567ZmW?= =?us-ascii?Q?miBKtQZOXdlxr+M2SDBTuvw78lOcn56QUhQRtsaCvRyrSgvK3xm9SjA0hJ+3?= =?us-ascii?Q?B7YQnyMUvGg9MZXcYlQK/9f29wdsavT7VIL5z4M0+gcn0Coz4rh6EynQBIxA?= =?us-ascii?Q?CuyOcGVPrF18Vhsy8GXWbeNMcz6mAV+soHAZTrdAScV6Rekdfvrf3liIDKMQ?= =?us-ascii?Q?lk1OQw1/uISZG3XbC4fn8qhYF6oPKYgvg8lv5p+7aV5HQ1t9+zn6iHYXnvLo?= =?us-ascii?Q?5j45bsv8VEaNGQ5udEwvu4Kd/nndtOE4FYLko0NIDs1zLZ2DFUW59Dha5HAT?= =?us-ascii?Q?7PFOZ2rXV7IPBsk5w8RoHpuIFUQehu8FoOIEKp5KK3JdKsN/LpU0PN+/OwVj?= =?us-ascii?Q?hU6vKVq8eRW5gdM7C1iuUG7eYCzz9jJFvMkd6Qj0SHOovrPxHAJbAr7X7YZd?= =?us-ascii?Q?l5S3JKm3O+LQbN+Td+YwbPLv6lq2FZqkLu1swF8MRjX1oL6MfH3gy/2SIAPL?= =?us-ascii?Q?srm1mo2qfii7r8x3h8dt3yeflZop++zgHqAGj8wuq9SsfUPLstZFso8llaFF?= =?us-ascii?Q?RymdZN1GACSB5nNnDQIj7YpYt7gMx3eODp3ptMxYWJyJCXdCMJJwAGi23dSp?= =?us-ascii?Q?C4trCsFd1Zq1lSnCDn69ggc1HSUniOBHUMQHWHMFzxFc+XLiN4PEieeWtV3n?= =?us-ascii?Q?8x1OrXEnHSy9exHH+fcHq/9HOg+wI+IYGIINnL434Zs3f7uIkrLxGpYYBihV?= =?us-ascii?Q?KAS3eIsZnb9pq7Bhqd0Mhqn1faJ2fTbWqpiaCG5fLUVpjznmm9G+w0RYSCCW?= =?us-ascii?Q?Hw689AgLQ/bLnGLJnYtlseraC5fS+UtjQ6PiSBb8vCMpg38ksytYdZ3J1GuV?= =?us-ascii?Q?A0EXRlcA7H3iOcth1fzXrX1fCiDCn+6C856w5ZRJi3a9YqJqsw74zlLEXn5B?= =?us-ascii?Q?wMXzlLwrLzjkEwh4ytdI/ug55x/biM9e5df4xYIsQZRovoQt0hLttNdeT7Hg?= =?us-ascii?Q?5OAu3pRhK9p9QGvIlBUPVKJFUp62Y0SacmcmIo7pd94dMu3WxDpt4W0NkG8d?= =?us-ascii?Q?vilWRTlLL9Vexg26NrtJutDZbejyTJvFoyO77EN9uK5R++6oOZweh3+0192F?= =?us-ascii?Q?s3omD79nvJrOF3qUili59q2TLMZrGZGxLXpdvGX3?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 53a5ef86-9e5e-483c-d75a-08dbe4dc52ea X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Nov 2023 06:38:33.9346 (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: 2JT1qadcLMprXS5rWa5me0vy69vfVymX8MAQo6bQHgPESloxY4DGJiTQwz8OWzGFZX3ATJBMSo1pC7z6u1eRZQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PR3PR04MB7451 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 15:08:21 2024 Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04on2077.outbound.protection.outlook.com [40.107.8.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 0AE14612A for ; Tue, 14 Nov 2023 06:38:44 +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="MqS5QzSX" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZNWphbCiU5UOIWhOLUTLCIgtj9luiPrCnVGrb9JXtB+4IIo8+Wkx8Ef/oGh9qd/Jlb1BkDtXfrhUPtcv6Y7JINaHUBffn+5yqFpLg9d/hbHOnE5B5ljQ+BXmgz6zIy6mteVIDxQY2lL4mUGBCuB163QZlap2AwGaVVyOI/G7VDvjaelM6CV2lHexC7hMz78fZR1QBCfhINOUH17C58PN267wTYywGZY1zrZUHyKf2uT+csPixhl0Q21n9/E6C8Jjp+XfqPieK8w1KOwRehfYBUJh/lrzXcklHdOlpPKPCLNuswUIO5tjMj2xJ69W/6CWmeNCl+Q7K9lzMXRKWbwyAw== 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=TvvDCcy5aPm1Kk9zk9QyxeF7f3OEKCuS/2nO2LeI6ZtPP5pzQt2ByVch3Rm+7mARYGcU4TnsB1bj7LgKcl1H9Mc3f9V9Ji3x85bf/1BJ5eMnY+3ip/LOUcOOrq/LsL62dmrruUtgwF8U5ofWrCVnvqxdq2WiO2bT3buSmgLyZPYZDyjo13ZXCJN9q2RgWtbo28Z3wgiwILOPBrCDM6rIOkHGLAeVtSujY6ZUnPOC8SqbgKitoJKwU5zoYhBFUH9giiniPxM8P61fj0MV2HXmLvkxxQQOc0ABrJ3w4u+OhSRSojGlLQXWig5GshqbN7mPIduNbslwBpwtLziyYUwpwQ== 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=MqS5QzSX+HKktBFIp02TaEJghSuqTx9jIhGY5LH6X6nMJGPPtz4qSHeinECEDGDDGccPSXBxShLRn2otE49irlz/fB7cbpyVKWJMkAbOfc1uBEmGvY9PsEDTZH/cFHilnYVataa8chXbQLnWL8qhj39D+x07Hv5gn1gvlebD6tE6RqHX/Ftx2BRcKKv1+HTqzaHzjClf+zwIknNFJG+wzXTKa3zWmyXOolXeEkTp7otzO6lD4zEnw4PGto/UXDUwl6SdljwtIpxmyQ+UZPpDeGRcTLdhGDI0TIFvMq7V7TocuflDy0SJkxK9wwv3TV43vEsleykIom9+bCW/2qSVkg== 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 PR3PR04MB7451.eurprd04.prod.outlook.com (2603:10a6:102:93::12) 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 06:38:42 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::7102:259:f268:5321]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::7102:259:f268:5321%7]) with mapi id 15.20.7002.014; Tue, 14 Nov 2023 06:38:42 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v2 06/32] selftests: mptcp: export ret into mptcp_lib Date: Tue, 14 Nov 2023 14:35:25 +0800 Message-Id: X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TY2PR01CA0008.jpnprd01.prod.outlook.com (2603:1096:404:a::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_|PR3PR04MB7451:EE_ X-MS-Office365-Filtering-Correlation-Id: 7a8cd5e6-2f3d-4f18-8618-08dbe4dc57ce X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 2N8jfI98h/D2XzKfHnI7kTBMYAn0ooEwT49ce8ySKym2TO//jtqVnMjk/j6c20Oh72HYXUZjYa/T6PZ5u6GlPDCdvPfGL8HRB3NeAUFy0Ue+N7roQgFOjezA9P0nyoV8DLX1qSbeO/4i2LbQ5QkzpwncJPGCX0XnrhHvF8h5Gkk3vLFBKa6NybHJHcngTGgVXZTgjo2uCXblfyaG7oVxpSWoppvv4hF+erp9bULg7ZLsOlPq8Vp/dOvnDXNdqYu/mnXwNJCnBLLTxS8GyEGOUtKItUXCuitUWuD6uvy2YPFickCpmmVh6kCSFoQ+0+aQSRWP3RdMm2V0w6EgqqG3/kr4Oh7WTQD49dWHVJiai/u563RrM18fEs4bxNeygDsdNlZmOaP9+5LdVmBotKYpLzpvNQQfBIOr8rkuoDKgObPmqGp7bdSSp0XLfRKLUVXw0IWN8rn5oibT6vC9gk3pu2Xm0V28wUir9icbid/b0HQjR/G/b4BlontuEc2IvMmKLysj+b2Dl2lLrCp+TvMUOBTCZL2zgmi13t2o3IX6zmH240XP6X5yfXUcf85neBf9 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)(39860400002)(396003)(376002)(366004)(346002)(230922051799003)(64100799003)(1800799009)(186009)(451199024)(41300700001)(2906002)(44832011)(36756003)(8936002)(4326008)(8676002)(316002)(66946007)(6916009)(66476007)(66556008)(86362001)(5660300002)(6486002)(478600001)(6666004)(83380400001)(6506007)(26005)(38100700002)(6512007)(2616005)(107886003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?89I25zLB4oIIR8KGir22HdpMZKUR2ZvCUrnuo35UpB1dknN1HXLd9PMmWDQn?= =?us-ascii?Q?U/OZEhU+cMshuL0ttVXpNuOPUVJfAc9QvFgqPZXvdn8RKwHhpfBSSRT/2QN1?= =?us-ascii?Q?1eDNzZDgOm5Q1j5OE5h4MEl2xGtq1XYY3RSdfxDrGjbNMC5cHfMBSQ5Q6Zlj?= =?us-ascii?Q?yAzzvuytBT73C9Kp8zzjDY5SxjBoqFJo51QzRw2lkTMWjHpCy0PV0v6itGp+?= =?us-ascii?Q?B+K1R6l4bKpCJyqoi7uQejQBLhleRLgjlvF61BpdjcvZILCAQg/ugWZIg03u?= =?us-ascii?Q?bC/U49/6rBYQagHPDf9eI1hkWxmv3IFPIKeomK2TprgoX/SvoAlF0Om4mWSV?= =?us-ascii?Q?jo/Bhyvv9BVOmhJEulg5184NMTOS2YBFFfxoEfxn1ZA4LPiwdqwdoUqHxtyB?= =?us-ascii?Q?mFd2KBH+vAQGWqohI4Tm2Di9l4JVL1SncV2Z+z3YIJZIUNlL/oxNhxZK9bLR?= =?us-ascii?Q?kKIeWwm5ZYH+fYbvvuXHIrhRYSSEdZ1aQUbkL/tBA15puKUatSpZHohez2P0?= =?us-ascii?Q?n1hua95rvIRhgpdcGgvQFlJhbncF9jYmWZlkdo8B0vTThJowLKYaLGWCag68?= =?us-ascii?Q?Y5XlvjD58Zfh4CqN9LEpj2bmmA50mqb4Cp9JQC1cMXK9XU2Oa4hg/2k1xm4k?= =?us-ascii?Q?eTa64eylPxn5120m8BP9AHM1h/qTvbg9p/Ufk65xqvLIKJcp8nT1SzqGD7KM?= =?us-ascii?Q?++a1cb/VKiRINNgnpOj5zXVRQfpyH1FqgpOTxsmVpnPLg2wd99ig4Dx/RyTz?= =?us-ascii?Q?schui3wBx4vPEYFQA7Q0bJB+ttrFApj3GfmVGQ+B9gwUOMAa7LZWPE9WqV6T?= =?us-ascii?Q?glYGqv70QpE2M/RZbI02w1HcXqmcFznI8du/VZp/Bq+HFqY0yEcAjfMpNN3L?= =?us-ascii?Q?OgtrR/fxzKFH482YH18f5xIB2YV0Ms+JdTLtOJ18QaSJOMY/qFr4vIfwSK1P?= =?us-ascii?Q?E/0K3PS5poqq2/8w8adH2+TCnNxles2LjhvfaWc8+sd7mAdDlv97Wpnmn/uY?= =?us-ascii?Q?d193YlR9KMhQcqNwIWZdwmZ3HKYUZeRNMFsnjd1PLo1CtnaBVuJw7TzF4J3N?= =?us-ascii?Q?Sb2waZLmEHNtAMpZeM/Bpjw74VN6q2T6vC3YNTHgNyCSGUgZ4HZwq2TGMJ2+?= =?us-ascii?Q?6OU2qklG6t+uKGa53BESJokCCOnNL6ycnQMmDBeb+0cYJ/8avUg30ADmPbx8?= =?us-ascii?Q?oeTJJPY0JFo6HNeeUzdZWYaxh9KSKX5hJHaODNFqNk9Z89yRLPvu5i4VZCSO?= =?us-ascii?Q?57PQsqSyiyUtUMPImkpvNXW5W9lKfz6fk2jZ5d5oE/Pf3E7aa7DUOLLK+0uz?= =?us-ascii?Q?Vma2VHY/wxFGKKb7cKaXSaQm1HdHIKpccvPz5LNYRT9FOiSO4Dq4C57S0Pz/?= =?us-ascii?Q?Xz3MASQ8VI9kgbjX5QVfARHyCx/ieq9moJVP0wj1uT8ujj/Xvc8BS4GRrUWU?= =?us-ascii?Q?RoXI/MxaGLzA7Kr88Oe6QJaPg0uR0/Vi7DnLXyD0ki8W/0gKLYpegRjTCVmc?= =?us-ascii?Q?BrvObp+O7j4/hggSNSk675j3DhditfNrz/6sPckYxUNjau9J1GGRflCvrhGU?= =?us-ascii?Q?XDrAHeP4akhp51Q8y+VyTi/0qv9rgH0TBwEplW33?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7a8cd5e6-2f3d-4f18-8618-08dbe4dc57ce X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Nov 2023 06:38:42.3730 (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: HZI/RQTDxKih1QYgzIEMwR9711ekkLbIiQok9YPQHrAQJloODfQ/MeqmG9mFvQ5FLno8Cf8R0RYvgEMXc2+Stg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PR3PR04MB7451 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 15:08:21 2024 Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on2076.outbound.protection.outlook.com [40.107.22.76]) (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 0A0E8612A for ; Tue, 14 Nov 2023 06:38: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="iFCoMRb0" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QrEldpDIeClUQPFtkvAXtdNq6EPQIbzYHzzuatx9FQh2QtBy8RkX6uAREQT4s3eNj8S6P2TSR9+7iUHxKeanudtLVQBQoFqW8+3QGvm5S6VS6M8l25talmf7cr3Mi6wERN2XQpTOmLato01zC0/nnCgvRAAXEAEUKxdums/7GPCr3c+ECe4BVzi+vu/A7AGjL4ETK38RxBf3h6u2fiLUV4UXApU+9lhfxLWM6cyRUUkFnvnnlUsvtp2X+HsTzhjNBRl1Hb7b66rt4swtjTfAlbHKX62DPJ8owyqfkIbiisQCKz86uxc3IAEqBfoy2U6uJbuErlY3/3e1eBHmt1Ay/A== 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=ThAX2+rYnUXr1Rt4T7QP6XKbepAXSsnO0C4XajgFiA1ZWyDEYrvMbqQP6Q4y5bptUgh/3oaIEM4FND4ti/7okId97SVs0aW8bGXUTJe1NbAk87DndQLQlCRbPSawiKyuURWf3VAQe8IrfAgmbwcW7qOYpCNAfwL0hTYbFqN2We+OwXmWJcXB5i8meYXteI16FVqxNr50ZOmkOKsV8H7szCQ4zIVWLSVIEIpKoD+go0d9zAebSNSZiJ4/667NJwqHVsnq0xQg10D6lwbXSEK71XONmT5u8wfG98RtYw0oGvHBGt8x83cTVyCIkF85oLsqskhpBU1/uwY3GlzP2bmEjQ== 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=iFCoMRb0a+JckCXoP/Y2Up2OFX1db0FNFcdO5prVwQhv5KAczxfyU3D09gsyj8JX1zkGA+3m08WzeKDqQD++LC4W761BM+M9lwir4AdHRbVWVvrRqTLSsQ9Obb330nprBDYxZsEoVZ0x213ScKGgl4Cqzm7XXTsV7NErHzetxGpQNbja34RAv8MLElevHQwRlgXUS+45uyit04fClN24eZwANHO9PoOBOiL26MSHVgR4UK6hI2p3ArsLQ4mLc9JILyW6rRsfFoxg+skNntAv18p9rMhih0SPqiCVxbxR6pk03ca/vIVZwTxTaCpwRQg91th05SVm7WaSLiMfdZp6Ig== 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 DB9PR04MB8480.eurprd04.prod.outlook.com (2603:10a6:10:2c6::20) 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 06:38: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 06:38:50 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v2 07/32] selftests: mptcp: extract mptcp_lib_check_expected Date: Tue, 14 Nov 2023 14:35:26 +0800 Message-Id: <7dcddd1f3d03b7869c21c5cbc6ed9d7107849e9e.1699943337.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TY2PR01CA0006.jpnprd01.prod.outlook.com (2603:1096:404:a::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_|DB9PR04MB8480:EE_ X-MS-Office365-Filtering-Correlation-Id: 5344447d-4155-4f46-71a8-08dbe4dc5c8e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 5PNWU0k3rhmAtVLoE19uAqcLhfNaL4qf2d28ZLLfySwjSkjjOMXwa7EjMXdOhcS5mVviS5mWeBgzSrsZexAlDSiJrWlCmcgOPI4mVs5oEHvi6JSFVINqktuChMIVTSuzRfiRS7SHBMpbnAwugL1PrwL899ERKCGJngtMQqkzCw0qKS8IRqg2GJh/NgCf7Lg6aMqA2GyypdeYBEM0KIhQ3wMCfQJyGyqgLbpN26aup23rbAU2CE8wNnnJJp6gjJ0gtqGFOTJ+4PIwrt35k/YJLK3A8MpEjBsCGCefzatPLcS0TskTbluEcg4m5uc9R2gMvueV/QiugHgwcbuDwDnncQ8TzVAglr1QJG+TTZg4uwNBWEvE1DuFMYlCtSvrDZOdegKebyDgUyHmR7L0tFZkeYeeBGDM5oTN4pUVJSfTToD+IE2nuntEMdu/LZTh3nBjxlaDUbiLzrkaQkIwo8p9KLOkWOAsZ+Y/SUceDI8mhKNNn3dkequo6lNVbQAS3T3maAiAq4tkb1D7RIJB/QxeUUXrKgh8fMGJL40b/HzSxXRtSxCsn9lDnrzq+yJFm3I2 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)(346002)(376002)(39860400002)(396003)(366004)(136003)(230922051799003)(1800799009)(64100799003)(451199024)(186009)(2906002)(41300700001)(38100700002)(66476007)(66556008)(478600001)(6486002)(86362001)(66946007)(6512007)(2616005)(26005)(107886003)(6506007)(6666004)(83380400001)(8936002)(8676002)(4326008)(44832011)(5660300002)(316002)(36756003)(6916009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?TUDszy/y22uRRfrqRsuaIOaiyu1YyGG6NpqrwS8q38GNmGjte1rdkLkmIAjO?= =?us-ascii?Q?UUMQR4BexpF1EOM8hnoX0rvYFKMiamsb0vQRygWpL2jvcGv4G89q7Q67S+aL?= =?us-ascii?Q?DBuXYTRN2IUQ+zGLiyV++D8SNnRzir8jhty1R9npxfQcJLQfnGlU29KHyzxP?= =?us-ascii?Q?mrvtOOANrYyN3pMdW9lpcSvExKxsS7rt4pnqhMwd+Dh3VePAXpUmmcfMaEDc?= =?us-ascii?Q?L10BhK5zCIYVgEBW2laOY9ruROrIpPKzNy0D3teW2UnQbnnvPbbRsMxDVsHn?= =?us-ascii?Q?LGwWVYlsCTtG0Nyh3jsjdZ3FfWLASWuNSNfd0S+4rucjr5Un1izUJ6K4iw9o?= =?us-ascii?Q?SJTGpfxjrdTkL0hPc2EfSd9eJr/MmWdBvBKsN/t3Q8BwnOWoewRETOshzSce?= =?us-ascii?Q?/dJsDuEbZVUzzhFxvC18bXTxUyk9r50zi5Lo1+4yS5W9X/njCDobsGkkA/MN?= =?us-ascii?Q?bDaB4NqNIr/9TzzVWKUq2Glq5Pn5hBen0B6k7TdQenfWAXVBb4MrbI1ihNAH?= =?us-ascii?Q?EtzXwo5pC4WvxZwkHD8ZjWvaczvrjuRUiRm/wiTs50NLFW3E16uXFm2xWlic?= =?us-ascii?Q?1XOVe0RmmzSW1NktHC96Js2Jg7cfag/y1F7QxAH/aVdJQZqprkQTMEJ4jwXx?= =?us-ascii?Q?XhIaQXyxjXIgpcBuJGy2jnQhMy1ue8oefqwWqkJdwN1jn5a734+iPW09Le2x?= =?us-ascii?Q?CuNilB4C0NVbjnh7BfzM592SA5xn4Nx8zG8aq/Uf+fUegfsWijRbbO4zSxkh?= =?us-ascii?Q?JYfWkPoF7y9HujCO8xPFjIT2hzPMgN+yuVBbuyt5MejpDE+B2/HQytHu1sw3?= =?us-ascii?Q?HWk5u2i5UEmyhdGpmdRMi2GDoBXn79wqT68gK/jXOV3oICH5BNEB/HAEs+5e?= =?us-ascii?Q?4ZVLVDhdE8hfigHeEcjJvc6wUS7w45WOpEGYCLVxuWXB50hmljNumooNsUPi?= =?us-ascii?Q?YlZQqsq49PixCoOIlXB2OsIXwFypXGjouHidjKMCyNKM+4xJOdsc+zta8ci0?= =?us-ascii?Q?ZXA6zV9jTPGXGH+cPgZD+pml39oOmMlE9/h96hXyl3201iBb6PFD6LeAhpsN?= =?us-ascii?Q?h324Krf2GYCqAEH5EPBr2sWZXXnYG4y/bdDT+G9xb2JFbKa/IWt1p8EZi6+E?= =?us-ascii?Q?UldlhdaEI8i+yRHUywX4KjBIHgIVZLWGl5Yj5S1PRvqLx0G2MEGkFDGaV3qu?= =?us-ascii?Q?2s7lA1C4vcB1hADn9HVqxQdPuKrZcoaDBRKWZ5A/fPgu7LaaDX+aN0XjEXkk?= =?us-ascii?Q?JQlpNEQ2ajYB75yLWoxvYS6mBasincEXcxbA5LfKIkvjIZN9dsNoebja0pND?= =?us-ascii?Q?5KMcodGg/HoGvhGFcV7qjPPaM5lXAn18eWRMCBQQzJVIIXuNFbD7V35NuBF7?= =?us-ascii?Q?J48cE9XeljDi3tvcIR+BVjeblLEJSCRa3fjgsP9IbrLKgP7uap3jH5owedAR?= =?us-ascii?Q?zfTgx0IxMC4jxgvIKrWYDsB9M2mtymNfC0/r65OiKpUWi1woRMFMFhisH1Eh?= =?us-ascii?Q?bsBr/Dy4+ulfOcDSASjS8j7emFqSt/n1qk5ojqX8Bo2CKCKSbKss+zEdmcYc?= =?us-ascii?Q?SH40Xg7SbD5pSRyWhMSEtegQm8+ytBvHQixDR10m?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5344447d-4155-4f46-71a8-08dbe4dc5c8e X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Nov 2023 06:38:50.3763 (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: MkeBQ7obSqbPg0H6/qq7QLeDKpkBtKCfUdilBr8OEiXb1ywVDmmdTbLBVjopqhVWs/g8colD3DsPa0WN23kryQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR04MB8480 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 15:08:21 2024 Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on2051.outbound.protection.outlook.com [40.107.22.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 15C38612A for ; Tue, 14 Nov 2023 06:39:01 +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="QNEX40jz" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=aLoH+EUbyW4v03UIz0RQfO2u3xWXKLiIIfRCbQ3MMg5zffcGlJBI1pvpQWb07BKptuWPBQEMNgu5XinVcxjYBiAowTPbBeXHFPgM83DMIgJCM9tukkTLFw+sOCIZSTm6zgjuRbpmGej1uiAuQwANP18/DivdHWFGhikH2qE02OTm1YTdkT8xVNmfENlLwBaplxpn6ln6a0gM/SbfRSVGwDtqZEoMnG8FMJc76eA5+8xHUsrWZclBnYxQ23ARw0VeiXrJL/0NdtR6t4KrPXgQrXOwGuSaE9zlsAD7ouj41aXlMlM4lJG4ym32uB9RQPAD8TGD2Rjy4YhHLkQLdpHf6w== 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=Pu5lgSYX/9rnYtfTdqvNcH2jvAMIfKFtNgzqLRjMwtM=; b=hAI8HLVswFnuA4rAG+/Ad2SqhRdTe4iS6eNtVfaVxL5Dtygt9LGxZAHoqfeG6ufzSf6jotsUwsxVdXFiIw/LGhJ8ZwFNDLT/aKHSbhJzh7vj6t/hqC+1+IbpQTgZMYe0Y+5d3+5pfsjacBvJ3zsTYm4cjXVmEYIyGoD6O1MKLFn00o4QfYUf0vQIk6pbAX5VYHUCcmyqaNkktjZD5jCjorH/9Gali1gkcyce5gApMeTd3O+AoWpe4WYEJ0mbkXdK6IV/FqG0vFcUgz86BgVmEm/xHlBPwnVEbNj/e8z+jfV6qokftcGJ63dwv7YEYnKWQ4cIrHeXDntg2gHjGsKneA== 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=Pu5lgSYX/9rnYtfTdqvNcH2jvAMIfKFtNgzqLRjMwtM=; b=QNEX40jzQZanWRe+vml+3mJOzAklsEgAvuLdoLrWxHIOkkHRGf2FhT1SwAn95+cgBuShjvae3QCWiycDsMAy0xuEhME1YtIU7wFl2V6FtPDVgUYdefaA/r/BnJsdZr5XSKYD6z4AfFB0HpcpOnDCqr/XaY34/RF/zp3MhNl+vjngo4+i2/ngdTP+yVXQKtBCZJHxCozVfZ0RyFVHKgInio7SRIcyv4zE7bBbaAf0QKeB+zWIjpfsebuO+S4stP5VEvlzBp9LmaSiIw9RwJW7cRadK06/+AIfx0Yx/4hAl4LFTHfzSUF7/Mb8fkbD5s2oyZzTolBPFR1gS5g2FKOVnA== 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 DB9PR04MB8480.eurprd04.prod.outlook.com (2603:10a6:10:2c6::20) 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 06:38:59 +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 06:38:59 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v2 08/32] selftests: mptcp: export event macros in mptcp_lib Date: Tue, 14 Nov 2023 14:35:27 +0800 Message-Id: <411c77bfa412392128e3b1579cb9770426a83fbd.1699943337.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TYAPR01CA0206.jpnprd01.prod.outlook.com (2603:1096:404:29::26) 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_|DB9PR04MB8480:EE_ X-MS-Office365-Filtering-Correlation-Id: 2dbc13c0-1888-4cdf-7e3a-08dbe4dc61d1 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 8kCS+YUytOKOgNvvHkWgkOcEcAL8bKN+gHIlY+h3rPjFIosXiyQdS4DVvIAb6u2/8dhYM+33j07g9wEsV+uGfq1PwnviyawJY3ibCkA+E6qbNoLBYaMdrvHDgiDBvmiQpVALCQXuckx+ygg3R0ZH6hzbBeRf7t1PiJyRGs2VWKGZzS34bVLCB/7U4tZtUqnIoR7XXwyl52WlmHm99/ybnyNtFT1X0JNmkEtdIIqmPsSnVnXQRcLSOjL50hxRHTaNNa7lQWKvrYfK/QmDycfUt/bEW2gtn/namTIznV05Ds+F3Ur/3rKTzOWUotHDhkZWnLWEEdlX0Ki/bEgP/x3I9DwMM4y4Vs2LyZNHDElWCmMzn9PoupUhqdesYaMIPZ/j1WKXmXw5vfj9FCaNUXzAEix063jrChc/wf8wGzm7yLGw/D7zmlYDjAM1yGoIryPdGD/kILhgg/Ilkda6fZtM/VUwu+Mzy3WIpolm9C104ZKYyAkxKOYK6zgTcLAvTsk4O1l3riciMTXTDc9cJEl92jgvzIzx4xmH971kfN4De8xzIfnG+6CmV+IBd3cLJSHC 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)(346002)(376002)(39860400002)(396003)(366004)(136003)(230922051799003)(1800799009)(64100799003)(451199024)(186009)(30864003)(2906002)(41300700001)(38100700002)(66476007)(66556008)(478600001)(6486002)(86362001)(66946007)(6512007)(2616005)(26005)(107886003)(6506007)(6666004)(83380400001)(8936002)(8676002)(4326008)(44832011)(5660300002)(316002)(36756003)(6916009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?9Enc60dc4BNWj7SEQpGx4pDCVizGLolLy0khg8lavxEFFDXTpUuIW/McK360?= =?us-ascii?Q?YVWrECX2KxaF/kJRowSU0rjIg4vaxvvaREU9EXYZjfvruRU7dbLl6+qm9lYN?= =?us-ascii?Q?p3wDIsjQJNFHfnGHmCMuD8miSIzxEkfj5cRfYjP/NBw7iYF+Q0s82K/DEuwl?= =?us-ascii?Q?r6PNj6NCZT11dFmjCfovlkLCBLMt59FiEIDql66juWWoYiGEVMMy7+xACxM4?= =?us-ascii?Q?GsV7lw9Oz8//YlglYzvP+BG9vC8Gc8e4y85znitnQ9nxEWGHEiuN26sBfVGP?= =?us-ascii?Q?TlUau1DQfUN8xnrlIniYlzrAwggt9lTxIa96BOGaKe613NNVNImdXLzVcrDH?= =?us-ascii?Q?f9IfvG2nzfwoozh0XL+KkIRf/cbeR5oR3K2DXnuNAbe8GhoR5BySonh6kUiO?= =?us-ascii?Q?Lq+I+By6T2mlypOP1PNDCfdChkopoaDmn0SSECzXddIfXvae19Z+cXfH5HEo?= =?us-ascii?Q?6TePwT5GJfVFlos90aX6iezF2CtUdE+/yyHLmEYr5706QLjx47dFIUaFGIGh?= =?us-ascii?Q?Hxk5BPiYXQLTaT7I5o+6NRCIqzkNhOy7DAoX53vHnXfptDbgnXodM1ykMTFa?= =?us-ascii?Q?vdjcwE+Q+5FEaCwik5zoYl+1rGWGBa0/v63NSx1txb88V69q7ssxZswh7KA1?= =?us-ascii?Q?QuHmvVU8qBQStZSpf9kZCi7tJQjIB039LoHCa1WkZtxoGcKssjBKdBQvjf1p?= =?us-ascii?Q?TJgFA/FFyywL0JOisXmxu8xfp6G+lIlP8kt8UDX3ypxypNegpWv58RlnxBPs?= =?us-ascii?Q?9hcwXp48t+flvlJTBCw9O+Ld4cpPRaWuiAhHqebPkqqcJadc2krgZnv1vBam?= =?us-ascii?Q?/mAp8wSx+qCFmnWOM1AbI1enANztF+dh0OI5LEbU9PFOmrj1XU3KZfZG9KIh?= =?us-ascii?Q?fqnrfuPZgby4wGAOJ3DNKrOjAwwTzOC/6le4rOBYMyIzzz0aZAbwtHhHysMs?= =?us-ascii?Q?6V+6LICPbxvtpEMM2rhI+oMelbzpEJdUcEZxJBBpwi3TRQedc+mRcwUwmhSq?= =?us-ascii?Q?Put5FZg7jGg1AgXZjzGJ8KNeb0Ve2Kg2wvzfnCcRrbmBsXN1ed7/aYw0raLL?= =?us-ascii?Q?v2sWSiZMP6HAmICzQ5b498pZayrRYBuy4Gmv2RrxLm0Jo4T+602Lws0sWLfI?= =?us-ascii?Q?twML1XnYiD6rii9ZuvRrtIpE3hLgNNOjFJFg9sG0SiNMENnSlxFRp1HERE2U?= =?us-ascii?Q?I0iKX5QfySASDQ7MpNTzyhq70LrlkusApNtlUQSOX+9qTA9dofZmJ0zh01v7?= =?us-ascii?Q?eHNKyTopytW4AdiUGrjGMX1dmY7OhzirfnkzSuP5RjIcZK5s2XB38drs4V93?= =?us-ascii?Q?aIsQtNjsSO8rCtot/5TyScRA6yLB4/EsDx7xdXqFyHIPozG6GEU6rAI1Dxw/?= =?us-ascii?Q?6Nm42FdD9HxaYNek8FmZuT7GEVr6L6Jo1pVwFC9HHgbatqpBcJDfwOKI7BTV?= =?us-ascii?Q?wRcVuTePpsAgzzsWtyfeGCPV1knHbXsW1I22Cv1mKO5NB1RdVbWzCvMR4SFT?= =?us-ascii?Q?7qugJfZFtKgBECI2dKDXXiFxSUKfNkXMPDUEGAUilFng9CSLF4it3Kl0GU3x?= =?us-ascii?Q?hx78q9Hmo28AoNf6gj3wPjwt3i4x4TNOoS6dkNDl?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2dbc13c0-1888-4cdf-7e3a-08dbe4dc61d1 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Nov 2023 06:38:59.1758 (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: MuXMyUSJQIOre/pZF9RVpdeDmYbKhUJLjxdjeOZwAVGrf/8rc2whmVjz2GMdQ3Awf/bRshMkldQ5gIdvTajGiQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR04MB8480 Content-Type: text/plain; charset="utf-8" SUB_ESTABLISHED, LISTENER_CREATED, LISTENER_CLOSED, AF_INET and AF_INET6 are defined in both mptcp_join.sh and userspace_pm.sh, export them into mptcp_lib.sh. Add MPTCP_LIB_ prefix for the first three and add readonly for the last two. Signed-off-by: Geliang Tang --- .../testing/selftests/net/mptcp/mptcp_join.sh | 21 +++---- .../testing/selftests/net/mptcp/mptcp_lib.sh | 7 +++ .../selftests/net/mptcp/userspace_pm.sh | 56 +++++++++---------- 3 files changed, 42 insertions(+), 42 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..036130569652 100644 --- a/tools/testing/selftests/net/mptcp/mptcp_lib.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_lib.sh @@ -10,6 +10,13 @@ readonly KSFT_TEST=3D$(basename "${0}" | sed 's/\.sh$//g= ') =20 ret=3D0 =20 +MPTCP_LIB_SUB_ESTABLISHED=3D10 # MPTCP_EVENT_SUB_ESTABLISHED +MPTCP_LIB_LISTENER_CREATED=3D15 #MPTCP_EVENT_LISTENER_CREATED +MPTCP_LIB_LISTENER_CLOSED=3D16 #MPTCP_EVENT_LISTENER_CLOSED + +readonly AF_INET=3D2 +readonly AF_INET6=3D10 + MPTCP_LIB_SUBTESTS=3D() =20 # only if supported (or forced) and not disabled, see no-color.org diff --git a/tools/testing/selftests/net/mptcp/userspace_pm.sh b/tools/test= ing/selftests/net/mptcp/userspace_pm.sh index a85eb83a61f8..6e5370275e49 100755 --- a/tools/testing/selftests/net/mptcp/userspace_pm.sh +++ b/tools/testing/selftests/net/mptcp/userspace_pm.sh @@ -25,13 +25,7 @@ fi =20 ANNOUNCED=3D6 # MPTCP_EVENT_ANNOUNCED REMOVED=3D7 # MPTCP_EVENT_REMOVED -SUB_ESTABLISHED=3D10 # MPTCP_EVENT_SUB_ESTABLISHED SUB_CLOSED=3D11 # MPTCP_EVENT_SUB_CLOSED -LISTENER_CREATED=3D15 #MPTCP_EVENT_LISTENER_CREATED -LISTENER_CLOSED=3D16 #MPTCP_EVENT_LISTENER_CLOSED - -AF_INET=3D2 -AF_INET6=3D10 =20 file=3D"" client4_pid=3D0 @@ -489,7 +483,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,14 +540,15 @@ test_subflows() ip netns exec "$ns1" ./pm_nl_ctl csf lip 10.0.2.1 lid 23 rip 10.0.2.2\ rport "$client4_port" token "$server4_token" sleep 0.5 - verify_subflow_events $server_evts $SUB_ESTABLISHED $server4_token $AF_IN= ET "10.0.2.1" \ - "10.0.2.2" "$client4_port" "23" "$client_addr_id" "ns1" "ns2" + verify_subflow_events $server_evts $MPTCP_LIB_SUB_ESTABLISHED $server4_to= ken \ + $AF_INET "10.0.2.1" "10.0.2.2" "$client4_port" "23" \ + "$client_addr_id" "ns1" "ns2" =20 # Delete the listener from the client ns, if one was created mptcp_lib_kill_wait $listener_pid =20 local sport - sport=3D$(mptcp_lib_evts_get_info sport "$server_evts" $SUB_ESTABLISHED) + sport=3D$(mptcp_lib_evts_get_info sport "$server_evts" $MPTCP_LIB_SUB_EST= ABLISHED) =20 # DESTROY_SUBFLOW from server to client machine :>"$server_evts" @@ -584,14 +579,14 @@ test_subflows() ip netns exec "$ns1" ./pm_nl_ctl csf lip dead:beef:2::1 lid 23 rip\ dead:beef:2::2 rport "$client6_port" token "$server6_token" sleep 0.5 - verify_subflow_events "$server_evts" "$SUB_ESTABLISHED" "$server6_token" = "$AF_INET6"\ - "dead:beef:2::1" "dead:beef:2::2" "$client6_port" "23"\ - "$client_addr_id" "ns1" "ns2" + verify_subflow_events "$server_evts" "$MPTCP_LIB_SUB_ESTABLISHED" "$serve= r6_token" \ + "$AF_INET6" "dead:beef:2::1" "dead:beef:2::2" "$client6_port" \ + "23" "$client_addr_id" "ns1" "ns2" =20 # Delete the listener from the client ns, if one was created mptcp_lib_kill_wait $listener_pid =20 - sport=3D$(mptcp_lib_evts_get_info sport "$server_evts" $SUB_ESTABLISHED) + sport=3D$(mptcp_lib_evts_get_info sport "$server_evts" $MPTCP_LIB_SUB_EST= ABLISHED) =20 # DESTROY_SUBFLOW6 from server to client machine :>"$server_evts" @@ -623,14 +618,14 @@ test_subflows() ip netns exec "$ns1" ./pm_nl_ctl csf lip 10.0.2.1 lid 23 rip 10.0.2.2 rpo= rt\ $new4_port token "$server4_token" sleep 0.5 - verify_subflow_events "$server_evts" "$SUB_ESTABLISHED" "$server4_token" = "$AF_INET"\ - "10.0.2.1" "10.0.2.2" "$new4_port" "23"\ + verify_subflow_events "$server_evts" "$MPTCP_LIB_SUB_ESTABLISHED" "$serve= r4_token" \ + "$AF_INET" "10.0.2.1" "10.0.2.2" "$new4_port" "23" \ "$client_addr_id" "ns1" "ns2" =20 # Delete the listener from the client ns, if one was created mptcp_lib_kill_wait $listener_pid =20 - sport=3D$(mptcp_lib_evts_get_info sport "$server_evts" $SUB_ESTABLISHED) + sport=3D$(mptcp_lib_evts_get_info sport "$server_evts" $MPTCP_LIB_SUB_EST= ABLISHED) =20 # DESTROY_SUBFLOW from server to client machine :>"$server_evts" @@ -662,13 +657,13 @@ test_subflows() ip netns exec "$ns2" ./pm_nl_ctl csf lip 10.0.2.2 lid 23 rip 10.0.2.1 rpo= rt\ $app4_port token "$client4_token" sleep 0.5 - verify_subflow_events $client_evts $SUB_ESTABLISHED $client4_token $AF_IN= ET "10.0.2.2"\ - "10.0.2.1" "$app4_port" "23" "$server_addr_id" "ns2" "ns1" + verify_subflow_events $client_evts $MPTCP_LIB_SUB_ESTABLISHED $client4_to= ken $AF_INET \ + "10.0.2.2" "10.0.2.1" "$app4_port" "23" "$server_addr_id" "ns2" "= ns1" =20 # Delete the listener from the server ns, if one was created mptcp_lib_kill_wait $listener_pid =20 - sport=3D$(mptcp_lib_evts_get_info sport "$client_evts" $SUB_ESTABLISHED) + sport=3D$(mptcp_lib_evts_get_info sport "$client_evts" $MPTCP_LIB_SUB_EST= ABLISHED) =20 # DESTROY_SUBFLOW from client to server machine :>"$client_evts" @@ -699,7 +694,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,7 +702,7 @@ test_subflows() # Delete the listener from the server ns, if one was created mptcp_lib_kill_wait $listener_pid =20 - sport=3D$(mptcp_lib_evts_get_info sport "$client_evts" $SUB_ESTABLISHED) + sport=3D$(mptcp_lib_evts_get_info sport "$client_evts" $MPTCP_LIB_SUB_EST= ABLISHED) =20 # DESTROY_SUBFLOW6 from client to server machine :>"$client_evts" @@ -738,13 +733,14 @@ test_subflows() ip netns exec "$ns2" ./pm_nl_ctl csf lip 10.0.2.2 lid 23 rip 10.0.2.1 rpo= rt\ $new4_port token "$client4_token" sleep 0.5 - verify_subflow_events "$client_evts" "$SUB_ESTABLISHED" "$client4_token" = "$AF_INET"\ - "10.0.2.2" "10.0.2.1" "$new4_port" "23" "$server_addr_id" "ns2" "= ns1" + verify_subflow_events "$client_evts" "$MPTCP_LIB_SUB_ESTABLISHED" "$clien= t4_token" \ + "$AF_INET" "10.0.2.2" "10.0.2.1" "$new4_port" "23" \ + "$server_addr_id" "ns2" "ns1" =20 # Delete the listener from the server ns, if one was created mptcp_lib_kill_wait $listener_pid =20 - sport=3D$(mptcp_lib_evts_get_info sport "$client_evts" $SUB_ESTABLISHED) + sport=3D$(mptcp_lib_evts_get_info sport "$client_evts" $MPTCP_LIB_SUB_EST= ABLISHED) =20 # DESTROY_SUBFLOW from client to server machine :>"$client_evts" @@ -783,14 +779,14 @@ test_subflows_v4_v6_mix() ip netns exec "$ns2" ./pm_nl_ctl csf lip 10.0.2.2 lid 23 rip 10.0.2.1 rpo= rt\ $app6_port token "$client6_token" sleep 0.5 - verify_subflow_events "$client_evts" "$SUB_ESTABLISHED" "$client6_token"\ + verify_subflow_events "$client_evts" "$MPTCP_LIB_SUB_ESTABLISHED" "$clien= t6_token"\ "$AF_INET" "10.0.2.2" "10.0.2.1" "$app6_port" "23"\ "$server_addr_id" "ns2" "ns1" =20 # Delete the listener from the server ns, if one was created mptcp_lib_kill_wait $listener_pid =20 - sport=3D$(mptcp_lib_evts_get_info sport "$client_evts" $SUB_ESTABLISHED) + sport=3D$(mptcp_lib_evts_get_info sport "$client_evts" $MPTCP_LIB_SUB_EST= ABLISHED) =20 # DESTROY_SUBFLOW from client to server machine :>"$client_evts" @@ -889,7 +885,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 +902,8 @@ test_listener() mptcp_lib_kill_wait $listener_pid =20 sleep 0.5 - verify_listener_events $client_evts $LISTENER_CLOSED $AF_INET 10.0.2.2 $c= lient4_port + verify_listener_events $client_evts $MPTCP_LIB_LISTENER_CLOSED \ + $AF_INET 10.0.2.2 $client4_port } =20 print_title "Make connections" --=20 2.35.3 From nobody Sat May 18 15:08:21 2024 Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on2066.outbound.protection.outlook.com [40.107.22.66]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BCEDD612A for ; Tue, 14 Nov 2023 06:39:10 +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="kQbcx9yU" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=EPQCqEyBHmXsLbtGA4n6j4f0cVsTQEvjBQO+Mo5MqwIi8xACJmThWgCYxcrCi/SxL7+UKj0VqmGi4WLa5eFyJMkx2v3SqEOYpgcofF3EVFTD6VrxtAWzxVetLLrKvK4wyN0iPceCqxpD3BISN8UtCRvyptKKV108VVUiNoiYpirws+gVXfIDa4VhzkeB0d2BvI+HmeQ7U6c3/g41/NxgTXya7hF7h1apeNsLSd51NMZcEW1tkUMFHrQUu8SIc5HvmS7MhlJ+r8uRolFcSw4bbaHRt6jMrXo1b7P0h4J6c+q+FIjMVLsIBrS266fuxn1fS0zAWo+h81ZLddZN1D/AWA== 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=b9ioPhQUKL6fyznMbm8avRfKNc1Xqu3s05AbZNbSOs4=; b=YT2tHB+nxltketnDhoKZlaE01K2LfismY5SbXZA8kGjaFes/xnxTjQoUegZesmnJNmli+r2yewzJvRoED4i1evRPo+IqbGZlr8uX9AKVvOSGF3UhYYTeeY0qN58VMxakFfUFXFA1s+xu39OHfgskERYYKaSSBeuvA0UJnSHVp1iyi+x+Jsv2KqF8Dknl33+Rs5Ga1VNJNJZbeK2qkt64ZCDw3dr0kYP3Oj2wjilMSrLG0Jy4eTB5z833GZSrl4bJORrClvg7hhboP5r9vTPxDAoJwNcjpBZ49H5KeDDQhifq210gII6tlZxcGaV+x+SpnYS/Jn6F5ev8Rr1Dc2SfOA== 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=b9ioPhQUKL6fyznMbm8avRfKNc1Xqu3s05AbZNbSOs4=; b=kQbcx9yUqsJHz2JSJeVleD1JqnKHLGhyXz0u2rfUg7Bx/P/Z5nXaZgj7XZD89INm6cAYIP8qDQKyzrX7wjtCneVp5ln0B/Krp14Y53ME2ospNaD7DSGxs+Hvxy0+bs+qHbiK0qYu27Tzbq/Z23I+0Sxfcr4M7vYnsd9qcZGRIYfpw+doIQua0ASvqLzWsfsyUoIeyf+o5xKYaVWFN3BkeM+1ojd7P0kHzbSTpNCq/K2b7+Bm7IUFgv0pNn45RG5H5/G3FM3hUXX9xKoHQrsS6uM8s2De66BJ8qb6YtUuQ0i+CU3bGue6Axd+UdZ3NNSGlvZeKgCw0FZA9aKBZFioYA== 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 DB9PR04MB8480.eurprd04.prod.outlook.com (2603:10a6:10:2c6::20) 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 06:39:08 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::7102:259:f268:5321]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::7102:259:f268:5321%7]) with mapi id 15.20.7002.014; Tue, 14 Nov 2023 06:39:07 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v2 09/32] selftests: mptcp: add mptcp_lib_verify_listener_events Date: Tue, 14 Nov 2023 14:35:28 +0800 Message-Id: <54dba84461555c2def301b1b300e064231360969.1699943337.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TYAPR01CA0194.jpnprd01.prod.outlook.com (2603:1096:404:29::14) 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_|DB9PR04MB8480:EE_ X-MS-Office365-Filtering-Correlation-Id: e772af51-c162-40cb-77e4-08dbe4dc6701 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: F7i1KN55K0ptWa9DpbTLwI+eUJFvgPUe0QO7riyS45JeTY7i7Swm/5smp/BS2EkFfpx1N+wnWlnHXiMFc1sp5D1W2bLcIvcr0qlmqu2EwS8wFIRswqOw2B7aNGDewvrJjiAIR+qyuuuFu5zhUCGhubHi/Ls/NNz+FkAr+avLia/nWEPmsxra2/ZO/yYEM6wrTdVSJSZawBuZ/rdTVMyXKubAAhw3LmF2H7/VbmPuzcI2QRkDwh7/UVe5h/IVfBxNUJgrMFdegTn8sE8c/loSPQiQdfMHJqYaoRTRRd5C+yZfepqNaE+oRtEDj0gfmB22GXlYYY6LZyQlb4WRl22+NHpbNSycIxsa1dpySlOz1hgPKUZ7e8ySZj170EDWoqxq1VizdU4dtKj6TDMP4VCvfUTKBdG8flYYmSqRS/1rZZ/VVUWe+Ft6kFJBHuwEra8/XKMYwywwFiq5iOWIr4qIgTAnVmRxLFb/9o/OBINCfbU78EIuVXSmGAqZuZ/8WGxYCmFYFlYVvVE9R/bkFD/npFk6V36/SVDsjut2w3iwubYhJ5bv3oAittTdLzBQCUHyS7+j2nbAKS5ziNcqFFU36sdjrza5IqGRugdebj0hOavFAaxeG/S59SU/cZwRn3Ly 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)(346002)(376002)(39860400002)(396003)(366004)(136003)(230922051799003)(1800799009)(64100799003)(451199024)(186009)(2906002)(41300700001)(38100700002)(66476007)(66556008)(478600001)(6486002)(86362001)(66946007)(6512007)(2616005)(26005)(107886003)(6506007)(6666004)(83380400001)(2013699003)(8936002)(8676002)(4326008)(44832011)(5660300002)(316002)(36756003)(6916009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?XOmSQ8RRs5Ccakolrr+7WiikFSAhaDVaLRSjxZ0HKFd0LlD7mwwD1UbxacXm?= =?us-ascii?Q?KFySfyIt4AC8pjzfanld0opZO670y+bKaY25e36q9/5yEq2RStwiBxCuRHaB?= =?us-ascii?Q?YvHs93rsNU9IcETHP8EXejQ+wJXTs3v3cofPDdQRloZalB4JY9fYsTyYYnYF?= =?us-ascii?Q?5NBXsmnTF96Luq3lvZbkKM3OwR/4jNdA9xSssqos69rGl4fn/4qjUrkMAoJB?= =?us-ascii?Q?KZ7ItwBrr224onHLEgXCtXE7PwfqGWhOH2j03TsOXLKeDS3d0ItaU5+L33P1?= =?us-ascii?Q?yfqTdNbeOVLyo/svuwI8mhQu06RX5uNy77FsQVjYbMVmkzlxPLsB7CW4WEAV?= =?us-ascii?Q?jCggL6RCJSinhhJw4NlrnfUAvFYZ6fBubDIb2C2ug3Y12LwM1G0HavtG7MHy?= =?us-ascii?Q?GQkaK9hRemsfk7mDXGp+6/+H+tEtIL+XX60HhF092iWg0Xt6pKfs/5NypuAP?= =?us-ascii?Q?xjU9y/h08PXsf7CLWL2VUWy9BwUF9bvnhyaBT6boFsdFWQZNsIzooAmR9M36?= =?us-ascii?Q?teYlZmzEfkyy9VPhXjc/b0uot3Osz5Jop7mVnRxxsrgDb42zjLYF4uxxsJZP?= =?us-ascii?Q?6fF46r1CC7cLcIb9y8HWDo5UJkn+pNi/tTZjRKX09A+hYPSA9rfXy3sAqdkr?= =?us-ascii?Q?tOp95h7cf52WCkphdwEci8n0X+KwDpXcQ3tlQeqfywWketasq8f9sBQ5vn9a?= =?us-ascii?Q?GvfdVaFAeF0W9dPtmUUe61l1gZlJdZb4ODU38YmTtF/pb4la2jasuUDT6Wuq?= =?us-ascii?Q?lisoLfYp3MBXRs4c4fJsLXRvNCazTSGt71Blosnt9vKqMvV46pFwOc6xc2B+?= =?us-ascii?Q?MyG59Zd1IIlHXVP2eqVodXWb8K6ZvKZyKQzxVvfPyr8jtbQjbgKTXikOIdAF?= =?us-ascii?Q?sFrE1TiiiL1cj7iuOqXJtyk+1XHrKU6JkLjx/1dPAPmZO+WQQRvdBC5tBgZe?= =?us-ascii?Q?d/RbbFNI20+Ri+PswjycGVKvTvKQbIFxFmRyxS1iIqwDcbeTlEtQIH8XMmKT?= =?us-ascii?Q?UlQl3CwHLNuB87vpHLMx5Zw+4f8uV+s1JP+OQhGMzxpWd9noT8U+vmGQjmg8?= =?us-ascii?Q?z6XFTUltxolBrleHaQ5bl5Y1jxPiChBo7vaRAz9fl0/BXjTxrtd2ji3Mplv/?= =?us-ascii?Q?Wj/deCO0ECc+3fVh5AMatCldY94lwlnjyky20gKLBI29bkqi7zJnh6LUyW3z?= =?us-ascii?Q?Eh2y0JOH2YZJZpquPFXOzU/bTs9+LMiSrvsNdPlPkhJOW03fA9r45dFl72aP?= =?us-ascii?Q?RrBWI8TY6VqZ7Sr49qrGcDnGJpIGDFRTA+Z/2GC67EIFYBsGs+olsSooJlF/?= =?us-ascii?Q?lAqcJOMweik+QxD0bmNYyU6ciCF20KZ2ICN8arTy3LoaNJUpPMRCBx9PK5m6?= =?us-ascii?Q?suzSMTiPl7HQPAWSMhoAH1MWpwWDa43LrXkxjeRwhRxhaalV/3iGc/ZZsYEB?= =?us-ascii?Q?cZ0L5EpghgtzU50lLlPI0VGjQaWQ316AKDSp/atX0sRxcEIieBaHsbdxhgM5?= =?us-ascii?Q?jqpVEfLFq42aHN+VC2bzSQvNXpr/p1ciYadSWaIO+Tj+bxM93gfzML73Cf9P?= =?us-ascii?Q?5TV0sx5AIN2zaPVWFwjZo2cqVE+MvAEtOYCaTENx?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: e772af51-c162-40cb-77e4-08dbe4dc6701 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Nov 2023 06:39:07.8974 (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: 7QWoSsNx72dNRC/F+fqZeTtYqIvYSOHSpGc2watY4p1ifHmSRUENJlRGZc0rx1VIxYiaKPhImJQSYzdISxcqJw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR04MB8480 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 036130569652..09d948f45f59 100644 --- a/tools/testing/selftests/net/mptcp/mptcp_lib.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_lib.sh @@ -440,6 +440,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 6e5370275e49..22812292b00f 100755 --- a/tools/testing/selftests/net/mptcp/userspace_pm.sh +++ b/tools/testing/selftests/net/mptcp/userspace_pm.sh @@ -838,32 +838,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() @@ -879,6 +859,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 & @@ -898,6 +879,7 @@ test_listener() rport $client4_port token $server4_token sleep 0.5 =20 + print_test "Listener event LISTENER_CLOSED 10.0.2.2:$client4_port" # Delete the listener from the client ns, if one was created mptcp_lib_kill_wait $listener_pid =20 --=20 2.35.3 From nobody Sat May 18 15:08:21 2024 Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on2059.outbound.protection.outlook.com [40.107.22.59]) (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 37D50612D for ; Tue, 14 Nov 2023 06:39: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="UsJBrQ7R" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fBTIQAn4n8J61sLqhdAPpkvC8dge/fvDbsyWbXga7Ni4VP8Y/VKIHmTBBrkoU30QiEBo/BV5eNWcoGPc4dNUfWEXl2ORQFqusGzOYKUE16jwrzck+trRq2rgs/j2ln/1Djkb7eHKuQvLdBYw8oBYtcMKXCDZLyEOON645KAWdtTHEOOHnP1SZy/Pfhb42Gg/64evQry/QvEH/0aG8Yo8arBmIgWlFVXTQyRUS1KPBmjyanrT3957oLoZzeLZ4FxE4zgdGepmwJl2Nnyyi1Rr+HTZ9h6YSSsAuB3a/56smgitDKNpjI7saqCfxGK9ov09K7YRL1cuAj/Zv6yfkD+eDg== 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=jTuwa57g5ws71YHn7vLuBDmeS0xKRQkVdYJ3M2s68IlF0MKtp6Y29V+TfDfpVK+wxo7wmt8CPGl4h5T9p3ZlEqoUV0CcTT+vjJOzQKtfQyIr3D1GRobXc1cDvKqdSFDJHtmDlU5dYNdOVJKQLsy0xjaG7/3QvFUbLxFfTqEymClrDWXKQKNxyM/arbZ0je6XDKDhjWUrwM8WqdSIBhH+w/+ie+OpnQwDdAPp5nJ+0+gL/lEFffJSEsa65OfxUSFA9xpwwD/cQy/IaEbpS/NIEkxTsr+tW/svvRkX7EDYsZ7/QL0LdYw59Yw64JCPkXnbL2xvpYkJug6D0wrzvMQo5A== 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=UsJBrQ7Rbs9uvTGzlcvz7St1OnXXb9Tj9JA1xmWiDIEFQNVV7wdoGW90CBzs2ZIdfEBPHvXvKQo6je8j+YhlmH3n4jJkbJfy7YHLZs/dMCYx1Po78oKg+EPDBHnfmJuTjUNBI805w2HgT+QdsWf5t/ULeJtPrs6LGv1ViRfAJvq0cG6w5nVd6a0rynwW/oQLXNMA+UWpxWcfwvCwgV/qiqkrYpRSNlYcGhk6StXUboY4tWNpLX9nYxtbm6zeB04kuhXdwgScZKsSaLJXk+fLz9Af8FAaOxYbA7S4r8D7MoTyTMcBZobXJaPRS7Vaj3BpDY5/SAhDIOe3lM/hggiV4Q== 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 DB9PR04MB8480.eurprd04.prod.outlook.com (2603:10a6:10:2c6::20) 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 06:39:15 +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 06:39:15 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v2 10/32] selftests: mptcp: unify namespace names Date: Tue, 14 Nov 2023 14:35:29 +0800 Message-Id: <16952ce5c8f2b17bfc683940ee96bf62d97a0789.1699943337.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TYAPR01CA0213.jpnprd01.prod.outlook.com (2603:1096:404:29::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_|DB9PR04MB8480:EE_ X-MS-Office365-Filtering-Correlation-Id: 8f0b3acb-9305-4958-c8d7-08dbe4dc6b85 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: T5j9oB3j6II1lKx453UVVHmkHQ/nvPCnh3ZdDKzDAz/rjGl5uMMSoDTHPvs08Hmap1BcD9v0tBgvcJLyqLeUKLRCMk8cTLTjTbihezHbS14xAzHhuw8Tw+FfZK9dJCp8w3h7ibIW+4e0PCwNb12pvCxOCB/wODtYvnxSzCOVbQqypcjOtkbJKfBoeua+MLNZ+Gu7e9GcEKqJqZbOuPQVLsU5WHpiG7oMfwFzcRCp2jU8HUysQkhxDT4JISADJl+Z9khNbHHfTc/RZ3fZ7cPtQ23sJvHvFFNWe9Yb7MehXTpqkZI2CCtsx1ui1g13LpHe0FaElsrqwT0jpvQViLqD/HbyuVhwhbTrOHjwpPl+FA3DkiXaKJMfKH7UEHaOymzzaUNeajNOs2Rhzbp+3qao2mN51xw1u7n3sdvTSPENoAsBY9HFGHX14xO42V9VQatH/ujm2yIc9YaXShuqeJXOcLE77+NubyhJOjUJbAZJ7t2yeN7X568AzdfHTcxzcu1o2pdxWuJRbGV1wBS/PjkBFbUkSKkBAo9mL8+iUWzbsHmvGS5ol7f9jvwLafoyHkcP 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)(346002)(376002)(39860400002)(396003)(366004)(136003)(230922051799003)(1800799009)(64100799003)(451199024)(186009)(2906002)(41300700001)(38100700002)(66476007)(66556008)(478600001)(6486002)(86362001)(66946007)(6512007)(2616005)(26005)(107886003)(6506007)(6666004)(83380400001)(8936002)(8676002)(4326008)(44832011)(5660300002)(316002)(36756003)(6916009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?C54b/mXLZ2blXmNagfstdX/9WYumkWJE7AVRWiPjxDPUCbvrxFxPztbnR9V9?= =?us-ascii?Q?Y8VSs9FnrZn26jakI1eB6fGg4pi8c755aa9ArJ0SuUZU7f7in7wuT3LKY+cp?= =?us-ascii?Q?w/Lb7tsJ3txAyxttY6c36lGm2rdSeRV4oLi7QaqHnFgzhg9cSSg3QKnIjS9/?= =?us-ascii?Q?oorSU6raAgfcuI55ccMdw1FX6LBgzkMYS2GkVW4WZXrqbNoEC8zYhFFrj9uV?= =?us-ascii?Q?y/hMDwB/XYEMGgU+S7qc2YgpUFQ2D+Nl/NVyrHiDK2fXq9M4hgDTYyHEQikO?= =?us-ascii?Q?2zzwsfvID2svEvSAk71wbFe/YZ4i36S71iG3EeLb4azOuLMc+CGginIC5Zk5?= =?us-ascii?Q?zO2NxQ11PFv/c3JHomhWQXVn8KajXCSrfl8z/K9pRMp7wAlCScC/Q3jvVhKm?= =?us-ascii?Q?cH822SIyuLXrC/VpLOJnqE+cKhfEUboiPqBIRw80yCnnu2zE1ACzVAsCs7tk?= =?us-ascii?Q?gQ0xrOzn5g169d+0yarvRcdk6+e2sanSJCjz4Kj1iNluWA7HuEH7K1jRDn2G?= =?us-ascii?Q?EXkc3H/IqmrcmemhGMpx/2i/N5bHYQ8ZElJac/XI2JeenCAI1f9EoQ8pVO5r?= =?us-ascii?Q?D37c2Wa3YmCyO3pMTiMiN0Lh2o/qrN78O+hbxBUYLg1sDNbVfM9uLFA8S9oI?= =?us-ascii?Q?DZGVJ+zr8Uyux4a6kVgvyo6dGx5Srs1a8TXkEV9pJub14Vl23AUzqAxLt1+4?= =?us-ascii?Q?c1E9YqdR4xsJNiRTSvhTY9tTjBp/tVzwf7/huZibMNmKt9BTP31hYuc/hDEU?= =?us-ascii?Q?++fFtXvh3eQ3XOLG2Px/43c1yM+CEVAZ3brh51Rb3rT7oPiTBSzIjbfciGtE?= =?us-ascii?Q?r0AV3j5a5vjuw24+Xu0RCs6eHNiWz823mCUqZtOe3CwKSU/DJGDgOnQvYkwf?= =?us-ascii?Q?SlR5vLRXe9EOj3raB9PA9eulnwZOkmB0fDwym2Fhem5/ArLUmcWJC74QeLyW?= =?us-ascii?Q?A8vvgFP9Al4BTCu/W2NOuEnIilrt9rJGBot7lGa0g+7i0Ho3BkWfJ6wY6PYm?= =?us-ascii?Q?KXP0z31OKBfjxUmcL+9xUeeibjiAmkz6+sZX+96ZdlhS35fiYNAW1hF7nHJI?= =?us-ascii?Q?pMuLq6Yu6P0clEpNwXZlln7YQu2dW5g9wrr0qDHZy8PJSY+kDIOyZNqzoudx?= =?us-ascii?Q?klhRNFDRMjiEUlTOEPOM2XxirPrFse5KwYT8D8dTZ6yQrnEKx5PbfMq+zxLH?= =?us-ascii?Q?+bOMgR/Vnsva2ADw0WKoIl1TLusGGyqygCGiGmsCrB+y60eezdTifkiwYg9A?= =?us-ascii?Q?DGstYafQNmtS6D35T5Q9zo89/gs3xLRZxHaNDB4zklSuN7nQ3mbKDvfbtpwX?= =?us-ascii?Q?wGW5L5gPne989eP55Spd/MhBE+7R6Qi46ywXArrLCz+4RnMYxt4lJMXTtbnU?= =?us-ascii?Q?suHY/NKTuuVa/dXYOGbrjRRYv1eyWV6Z+nDyp0yY6YqMMa4f63NJoJ/rJiXx?= =?us-ascii?Q?p//eVpre/Y0ZPsUHLHCYPFL4ZxJuFmnl7q19yUrTrXuqOERrf26kWHr0UpFF?= =?us-ascii?Q?pOR7PHRZYodMisCaFvBJY84yI9ed6ynZeeAinmcoUm4Gz56rcdJPZPbKX0cP?= =?us-ascii?Q?3wivomAP8ysfeUbAcdYX4jYYThbBS9fUeyaTc7Xx?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8f0b3acb-9305-4958-c8d7-08dbe4dc6b85 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Nov 2023 06:39:15.4802 (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: NUtAf+mRakstdjC9R8gk8MDJKYcI+7eRbHlXk/0qI4MSoZZkjMFNvD0QXbVd56a7Fvws5wM4TeY9c4/1M2dNbw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR04MB8480 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 15:08:21 2024 Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on2058.outbound.protection.outlook.com [40.107.22.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 25742612A for ; Tue, 14 Nov 2023 06:39: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="NIdRVl3t" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BpO8QkBdsnKyrW4rwUD7cC7hHK2L9HIk9+Eqh6rIw9pbnxxLzx6c5IMFJm2gpU0F3B37Y89owGrbV4hknYyjanPnSoN8CEQVlXmy7Ml/6tox0mkVMSmiUhT6v4RH67l/9IDUuIz2aHQBp4bfj2RvnQKHv21ydQPk9Q+/iIMptdbButr8CnegM/RgiHwofE9me5uWEZ6cJY6tGrEV/+VjVJ4t/xmtXF2ga549QrHoUs/Y4qP8/WDfGiTlLOiFeiq6RAaY7ubisMw+GV4FZKkzEnvTgu5VZZ3/5O26Er/Op7tK+vbsCa0KsSfpt0B+46V5Jih47noiuyMsBvIOy/kH1g== 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=z3pTcZmlnDgqtBPn6QYPKyX74olCJio0G4PnQmr+Rq4=; b=lwpBVz5Q3XBvh3+zSCbI92cSqwYfc7cjXzkFPcq4LcfJifaX1foRZhnQV/XFlq+biweGMuz2r/UZpV6JBb1I09zvhJpkKXEiPVQC6Wd4wES1gcJhR+Btyk7MqaPZb5O+6UV98AGKCPxYJMGOYmoej8ePayCal7gXPE7/Czjy5ER9vVyUlpESw/FXsSOMnzbjKeWZAhAX8qzFEcN1edoJ8fJFGKvHXioGu1WXjSkNm0n0GK41IK7fA8DvdDzzUaU5xc9dBMRgufafdQIi3ZfzUmtXXfxshcqjjAQxuahpS2rFCNCIbgYENBcWPUW9l3X00wYQ2jX48qo2y6acYUi+Yw== 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=z3pTcZmlnDgqtBPn6QYPKyX74olCJio0G4PnQmr+Rq4=; b=NIdRVl3tRl3FZAw+wgIoI+03MxO9BtxWmw5B+DYx1+WkfEhe77wZBbFk+dbV9jIFTAWYbUwFVrWSKeev+Ita2xktJio3uX5tVuKvnS68di0KW8+yI0c8I7vGzBnNgFkSIFV0Gal8Z/LY7xpPXjGDmix+VSD9ReGhF+5oXTj0gkqaC7nnw1ENWhNUGGGhxJktdt7k+UzLpQu2dPW7aPVkBkVA/847tP8AWH10v3PYa8RkLTQu1VJhvOspVvEwj9msEpa5eTCTO69tTrWJ7m6/3POeMr2Ae2sRm063qFxMHb4xacWbfs1ZaBg0hcvX9MALgERSTRIiFYESDS7FTjHQkg== 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 DB9PR04MB8480.eurprd04.prod.outlook.com (2603:10a6:10:2c6::20) 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 06:39: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 06:39:24 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v2 11/32] selftests: mptcp: add mptcp_lib_ns_* helpers Date: Tue, 14 Nov 2023 14:35:30 +0800 Message-Id: <8eda57c54159909bc1ca77d991fe3640f917ae7d.1699943337.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TYAPR01CA0216.jpnprd01.prod.outlook.com (2603:1096:404:29::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_|DB9PR04MB8480:EE_ X-MS-Office365-Filtering-Correlation-Id: 8f5db98d-25ec-4ff5-c2ad-08dbe4dc70b5 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: rsL83rgprQZXx1cRMaRBmmVpjvP3+jII5nSGY8l73zHXWashubAe8YQHzXiDcWz7fr35UbPEstqD1UsxlOufApFllH9/IusoBZlM199qHw/qMfseD4i5Ug0YFTpGbsHu6UQR/VEbBmal1tItUeHt/2CPifNIbONCowe/wIYq4kUuFe9ZqpZ0o6jWTRLeeDwiQc3u/GRhGwBhgRwYEfydNyC05mTbHbfsUtXhHGM4eRDrN1srC2rcIxR56xWvEqoAELQjDetdixCdVmTvflYLyKDTjPx8wnn+VWtAStq+Cl272wAW+D3Vb2+owJ97Il45LfQjzo6ZDOfq2RW9Lw/hnkT+4/j/DlOGHUa1+TywKcIFujRPpRisiAUSlRPUbrm5H8Mnjx4o0WCOD9qU+Md6la3kEQTZ4qtSjxzgH3jgZYyBJuUGV876rSDEGqtB4nZ2k5Ok2h3oQRUHypaBFPnEjbTWMT/SA2JOqLXbSYEc90NfSjNfqrOPPKLl7FVv0JuDSvFQTLEwiy/eOdk8U2c62jsrmdGs4MuAwcshIN380jf+98d6f0sgDVhCegarGZzg 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)(346002)(376002)(39860400002)(396003)(366004)(136003)(230922051799003)(1800799009)(64100799003)(451199024)(186009)(2906002)(41300700001)(38100700002)(66476007)(66556008)(478600001)(6486002)(86362001)(66946007)(6512007)(2616005)(26005)(107886003)(6506007)(6666004)(83380400001)(8936002)(8676002)(4326008)(44832011)(5660300002)(316002)(36756003)(6916009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?+eK4H8UCkSHl0L7FvSdvgPx0FQTdfTsh5vh1pdBH8gfCxUV8nkzN+D0SBjY1?= =?us-ascii?Q?KubAvv1Z18B8wu2MWwRCkSCAEKGAemSz1LeM9yqW8WeakvgQlOGmIrSBoCM2?= =?us-ascii?Q?kihty/pGygBiNf5HcIDH9+1EmMrraZfx1fskvGmf/04lCd2VlaNWU73Sx4aI?= =?us-ascii?Q?X5I8M2PgBdA4JaZScCscZlOx4nsZBNJP2MpEmJdX4B6onC7J6ImaLWmdHaL1?= =?us-ascii?Q?zyhO0UUTpKrAly6TT7Lc5yAlTHUIl/89ao/OBybZAsv2/vHIwXeSp+PZLea1?= =?us-ascii?Q?43gPePre5MzaWWsRBpbV2uTBuHl0fHFWDHYnJV4YOZ1wALwBfjJB378pbHnz?= =?us-ascii?Q?sWHjKvrWMOEaagw31/HDwLtukF9z44/ECpF/XY8qezavRftA3ZQbdV0b983O?= =?us-ascii?Q?ref+A1u0c+ztAJc4qSHMDpXiFA17PJn4dv0n+vdM55vqzd+DlO31FgAUMfNr?= =?us-ascii?Q?S/m/ZX3YM+wH97QJh8jUordBrzo1qMpv9Ad21WU8vI2iS9AirXEdSAwUv/Wi?= =?us-ascii?Q?UgyVa6/t5cIuhqrmES0RR0BCW8IvtXKPjE0rdTelJf8Z/LiDkztc/QYJpD7/?= =?us-ascii?Q?tLUPFQhLG7ehWm+c1RbJR7qMqWDnz1Mr9NECTqa7vK1LicNxdLZ8M5h4c6Oo?= =?us-ascii?Q?G3ylXJ9Cn0Dz99nIRGfFFAo+25EJCkVQXY2B9zmKhf2/37fkwEtja1tSlN7i?= =?us-ascii?Q?DADYxj7Xe3m02Cad7EUhmRcBbikGQ49Xk+nAtWvrQbooscIDYjCfWwe0j/7y?= =?us-ascii?Q?ELGM85G65AnppHHMIK2CUeNjrINR7Hz1M69eIpOxV4f1JrrgfK4PaBl8MrMj?= =?us-ascii?Q?Y7+JDy4DlSvpOzyvcFpO2JvoLQiG6SVFPKmfPLJpowS/PljXz2g3O1XlscRk?= =?us-ascii?Q?T27l3Pe5cizSr4skwNGnk39nZo8hx31ik71l0bwgAcepKDl5MLPyDu8vQeiK?= =?us-ascii?Q?hvzYMu8bYEXOOHNfHLYkJoB1ZKLAdjvfsSRDWLJUlx6N6EBKr3PMDT7GU9ae?= =?us-ascii?Q?K3WppOjjtW43P/JGnPfRfJ5dW1iB/RI70BSrpFbtXhn0ofFOpMLV5O282fVh?= =?us-ascii?Q?PHvccnx8KVPjgUDn5HfNinpNylPUNPcuzcqXfLg2KNQklLIy4soaT6Oh+KeK?= =?us-ascii?Q?EACFTEdopJ6lQuvKj75YtbhHpwDUoV5uLFWIBtIACv2iqQZ+AxSpv54iMkTl?= =?us-ascii?Q?LsCqTki1PdfDust7A8BVWV+SVnXUfAUp+f/xgZTkCh51EdpESdiEVKjZ/X1c?= =?us-ascii?Q?yADyOnCmYVbBStlzsYLkR2vh5AZpW9BK1ekCKhhTEGLXkB7Z+IdkLU6ekcKN?= =?us-ascii?Q?lU8+kSBX4St6jeqX5UPYAShhYd6mhVMuhepEB5skCLitAXmmyAM636xWoUpF?= =?us-ascii?Q?Cp0deANV3rNVuQXbPFeXcBfFdw0pi78IATmtfXURcpfTW/ytybUbSarbwnFO?= =?us-ascii?Q?a8fm76louUSCflBycv3YgnhhUlzPuoBScRFu6SRu3uxfeg9PZX94RNeVWvzm?= =?us-ascii?Q?OYgR5KSYlauKqxNRFnC6K0NhsSdVpTFi5XNSftsZeCAqToh01b4AWQM0mV2s?= =?us-ascii?Q?aVYtcqp6F1UM2dCuC9DaV0TlMDFDw+nOHRJHIpw8?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8f5db98d-25ec-4ff5-c2ad-08dbe4dc70b5 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Nov 2023 06:39:24.1818 (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: kDxUT0Q9/3RJCSHkee0FnHfSe8/x9pgIsSajCoC6Tk6EaIFZnXL7nXuev22BAqjT8xGmI9YSQWGfkDzWW4FWfg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR04MB8480 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 | 13 ++----- 8 files changed, 50 insertions(+), 85 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 09d948f45f59..d1bd8aa02c2e 100644 --- a/tools/testing/selftests/net/mptcp/mptcp_lib.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_lib.sh @@ -463,6 +463,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 22812292b00f..22a436c4a77a 100755 --- a/tools/testing/selftests/net/mptcp/userspace_pm.sh +++ b/tools/testing/selftests/net/mptcp/userspace_pm.sh @@ -44,11 +44,7 @@ app6_port=3D50004 client_addr_id=3D${RANDOM:0:2} server_addr_id=3D${RANDOM:0:2} =20 -sec=3D$(date +%s) -rndh=3D$(printf %x "$sec")-$(mktemp -u XXXXXX) -ns1=3D"ns1-$rndh" -ns2=3D"ns2-$rndh" -TEST_NAME=3D"" +mptcp_lib_ns_init =20 _printf() { stdbuf -o0 -e0 printf "${@}" @@ -106,10 +102,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 @@ -122,8 +115,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 15:08:21 2024 Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on2079.outbound.protection.outlook.com [40.107.22.79]) (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 8043B2F29 for ; Tue, 14 Nov 2023 06:39: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="GhUA5jA8" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=c+x2tTV67EHZxe1w1gUgXhAUm7Eht7tPR7JwhSVc8ECaF/oP4wdibO6ZTH4tJE1T1ovas4+sps/6h8zvJCxoEMakddOEn8AyrRaLg68209zImvJqloUcJByVDJ1Abw2r54CguiQkL8fawcQmSaJe+aKNu9nnlP77MO4RA8SM2y4uWoXY8tqLmnNo6C6l2238w1J0hAQb+hiOgyAosHBKOSnQTdJsT2l+tj3//kITgVP2td8qPY+0AMDcHo0GFLUu4E6pR/qNVskKvS894vxUgkXGFkmPiNaibt+ZriMSDfOPlpVSpn/GQry8gorMmB7U8D/D3PbZZqJmNk2/AxmW4A== 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=UrJE/+hkrq+hFsq4XoH1zAbXRmHxLyppN44fx5IBvcaSMHVn6sMK5y3qZSTzGS89SULTSodWIuHA1KyNjuV7m2uhPYUkQkuZ53jWTKXfmkqL5/eSQMSDpXZGslziGUPtuY4jv54CEEZzzOYsTYjKBrraYys+//lODMAIPWggK+M4JOU6XgNeETbYrLw8YPsR1cSCv7oC/FgPuXUOVJySPaCPmTz8WBn353xWgaQD8nrGSsWE6nFQ+n96wwhMMebK2eQ+GSGIl3Pj4TIZjZzeHsDcmscbRCRwOgOLWWueOiVow2cISzh9YR1+l18umtHk/60PGU98xcxBUhfbH4nNnA== 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=GhUA5jA8TBD5Rr5GoW1yDIPKrt00MNZvIMYsZCVvn3B2VqURxiSMOZFkuyRug6s8ZJHFYrDYwnYxVa37RJfUxexyAa3uHa9EdxLKxKrTlOj997Gvmb6A35WUf+bVC2a33qGh9h5pP3KxjhVxyW0OsdCSDOjJRjVjSqWPhUSzONCZT6+8RZhR0NebwnaTbT1V5iNRRbHhWC68pOzrnlgba/UyfI/dbI73+u0omAlqUfcL1RYetwfB4nBMcybAZrNcW43cl/ZEULSx3nhC0OVx/maNSsiuc/WpAcUFgwRtpUQ2hQ09Sa9kB1dSxlEkorg4W1QWsHtXEe1bA6mt0/1KYA== 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 DB9PR04MB8480.eurprd04.prod.outlook.com (2603:10a6:10:2c6::20) 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 06:39: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 06:39:32 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v2 12/32] selftests: mptcp: diag: print colored output Date: Tue, 14 Nov 2023 14:35:31 +0800 Message-Id: X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TYCP286CA0213.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:3c5::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_|DB9PR04MB8480:EE_ X-MS-Office365-Filtering-Correlation-Id: c3a5c3df-03f8-48cf-fc40-08dbe4dc7583 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: InjrJve48mhl5ru9SyTnm5g3A1gxiTjlaATtVfEpgCa5cB5rHfZLfyQ3Ri28UzjNk0ovUDZiaSQ6CaX/fCyqDkjvcbBwNr9rTIyVl4uVGlp2z8AmmiTZVPVsQvHvzRgR/8LN4oomgLRZzReTRunP5fK979PTiL1uJyJnVBNbcK3pL4tS4O4+cuIdbvTkLn1sPibnb7A/z8h7ZrWd8y36TBUbjpWdXlodJ+TXAdSECqrEhAr95jOMNe7Gz0eMjSpHxd/1/VQEJv0s8lY8Auo97wOpJNkdfy3oue+0y8+k6f9bQYAfeA6xHRhedVoKWek7nnxgh2GZYTJ5uXYvDqmzt/IOTpB9C6LNlYv0zbX4jhRudSLaPUCtXXCc3+YgbhwwNVgXx4AY1jy7wozJgCzh7Pwa79LKRrxt9h92cpjZOoXWBp5ql5QEBJBjVhKRmjZy/cuOCgbi+Wu2vSkkWCgT/cIm5csfZtN0X9SKIxn6xPkJtEsJBMlCKPTw61J019CuxONh4My74H3uhbL+VWkGdZq92Udds9GNmV+hsDiIrtD26aoMlNT8c2v0Q9Doqg2X 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)(346002)(376002)(39860400002)(396003)(366004)(136003)(230922051799003)(1800799009)(64100799003)(451199024)(186009)(2906002)(41300700001)(38100700002)(66476007)(66556008)(478600001)(6486002)(86362001)(66946007)(6512007)(2616005)(26005)(107886003)(6506007)(83380400001)(8936002)(8676002)(4326008)(44832011)(5660300002)(316002)(36756003)(6916009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?QtIIGPVswTbykrywBmYS1L7IYWnA7wnFZgyGdXTzVtxl95CxUHUDJb17V5YL?= =?us-ascii?Q?Dw2kaHXGVl9wdiUFQdbmjETlRyiiVAhVDZofLS9ofKhtN67XMDqcicr82DCx?= =?us-ascii?Q?lwWi3/55GPiCpUnO+PVVmGtA+V7YGXzOxGcVu5AacMALAkhq6aKo5s+0kpA+?= =?us-ascii?Q?AKEJSGqzE3/yOQJ7UiPjhJO6dcZkK6qh/FYbBFuAPVxORbw0T9eRYV9V0E5D?= =?us-ascii?Q?dQJIst0JO80QysQoXJ2WhR6E2Rq0qxssDf3nj3QyPa9dxECezlE2kpAL/WYz?= =?us-ascii?Q?kkBG8kF2RKTvmS/aCtQqoBDLsQV5c75yiF/+JbKQVchaqaAMuq9nGFlZrcvW?= =?us-ascii?Q?qt4NbwyZnCLhSIsMJa7Ff/EwUNVfl8NWZET0jEtz7tffovB7HmXS03zWy91T?= =?us-ascii?Q?wrr7NWmcIAl7YNRVzyiTEWssrBernY6PRImCAbUtx5DZKjMsGhurxf4uYWW1?= =?us-ascii?Q?OgnDvgfoRj/YBwQLdwGzZZFCc9ezhxsbiyJ9/VMtdHdSHXJ+xrPWRMlsi11s?= =?us-ascii?Q?TlNHlHqFTDViMXQTCJikpCJjc92vHWvzABzLuR30mOzmrOgrpEuil2k2eaEW?= =?us-ascii?Q?ZFlMCp3P8dV+Lxb/gVtSariD1EoJW4c+DsQK/re6mONv96uWRJjoeYQzfViD?= =?us-ascii?Q?2OOyp2H22TvoAl4Gv/IRmmjfWs2mpX6o/t2dRr5l+oGgX+VLR5lZkOlreIAk?= =?us-ascii?Q?BeZ3wDS9y680zF/0ilvFNxFjGOS/xQX6sFd1B7trMgNI174+KIbviGUy/kb1?= =?us-ascii?Q?SpTQaYTwTSrzxAYYuyRu1qZXERVFx1Ydq1g1y3Cfm4BWJNu02qkMt+wCYGZs?= =?us-ascii?Q?vfijdBtihA846k/qNuI4sBPVg2qAdcHJdrP4dKkrD9xOAvvf8BigLVX7BNUy?= =?us-ascii?Q?84DJmp2ZzVtGUnbAHdoZ5DuRMvRV6MS75YwTAlyCrf9UmDfT+vf62mSSrXBY?= =?us-ascii?Q?UAgHe6Bs9muxTrDJh1cCzu2RZwLy3NgZdQcv/QpEhTCyPz9neaQnHYScY6sH?= =?us-ascii?Q?kpzIm1xbXfGYqQpN80qniy6BOJtAWR1xE2jzK0N9yvctwtRlM4ZmLM+VWTy8?= =?us-ascii?Q?botPhaANcKwAhuU+vvLc0plxXDlAA6e2BWvkA9IOW3sXjcGabrOV6Pkzz3Jg?= =?us-ascii?Q?RDEzaR7qnVXNfMqMCAbaAGgUyujWLQQUeUO5edndvjm5I+ObnU05f8yUhBFI?= =?us-ascii?Q?w90oiqIHzX/zIewPUb1ujOUISB+EWzADRjBOTAkd+hEdviAKNMif+BjfwXlE?= =?us-ascii?Q?2rJav3icMXem7cHQLsPPzunyzHbdxBXmH1nszm7sPoZB99rUUilCO20EGTnc?= =?us-ascii?Q?sIdimyxHFm2wSman02CSazKnTgfoNm7lKQ853OADxacOKH8ehO/J1LA/OMHa?= =?us-ascii?Q?ETeagDRxJYreMmB1DhuXBNf4oRlPuE7FEBv9rVXj4v6QuJNuGzpKb8yp8daQ?= =?us-ascii?Q?OKl6K7qQz7t/xMGRkCnlJpd43CNU4lSlKGDqxKf7qoiwLdOnWcd1lpT2nHZq?= =?us-ascii?Q?7giFpDUQUEG+dL9aZvgwyyjdimfKQFTPAQDwR106ed9ZEJkHaiD7V38eMVPK?= =?us-ascii?Q?H9771DVYB2/a1u8LQ22Mbk9lHkDXKkMnxpOzKqXd?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: c3a5c3df-03f8-48cf-fc40-08dbe4dc7583 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Nov 2023 06:39:31.9696 (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: ZANrobbmlNnEBfV1dhNCipe2h00SBTalXW0n4qxrodQgkj2sdEOLg9FXgCu+EJmJJUFH445nI6lpaYXxP35Wvw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR04MB8480 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 15:08:21 2024 Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-db5eur01on2045.outbound.protection.outlook.com [40.107.15.45]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2A25F612A for ; Tue, 14 Nov 2023 06:39: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="nnZhWEmj" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=IIX1AG3Ep8LD7dE3H3fTCL9UN4yk+ccnV2bwJlOt84wu+vBYMxlQdz5Czh9D/1+jjFFOxOFGKwpoKHi6pz6KJdcYCwkXhKhgOfBO9RKWkMsV7IyXok8dNlEweO1UeS6g98AMGhOML9RZ5IS7+lu0633SwL+HeXpWrjHa8pSOsP2uaVzyckXzrlMAGE1a4wZbMbJbOeZGCdbugqRb5i0yJywmqc0G9l5VVrH8LOZwsDiAdwp9wuZpmM4Q5Vt/ajogTVkCwrXJvQAoXauBZxGEokkelXgyNfyjW4YvUP63MO0/oAQeta++jZO3ounTuASBRhGbjq3ExfqveFEMCy66PA== 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=m6N3uXNdjy8W2wCIAVFeaYJA43kqmRlL0GJ3J+tyRjaS7NOFBSFHLgI7iHqrpApBpn9Q88/k2Z9qNbSgVDu+OhE5juTwx4BV+nl5g+3yTE9LltS5l+3NbhvnXUY8i6hjaL1fwIiBjYP4Js8HTzgsYelbxS391cf4b49rsf02KbIxyr6e/rfYcFCTLScAFSmmMHeUxyoK3HBD1SWYs+QbSStMDs3WjDjYuC7BWcX2PKmQSXta0PT+BSCYhyNCoWL+US8iNbPowR7PiR0pwZbubiD4NJBWDxyN91tpAXW5GYwGAPQ94ApFj8CDI+2HSlHTbw8JXTFHj2mRgSqc1pgHFw== 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=nnZhWEmjv6Es64Lnu6ZS/pY2UahGLIbRvzaVStNEuGFQokcwZg3ZeA8HpJaqSJlOFXxV0aITBbcNFzxE1AljJg8xml6wsmITtGjzFW+cF5mSdsJ1j5AOoDkFGDEWlJ79k4TJSUoxwwohLQuGUAveAMlXiy0NrOp1KPF0j/+hGzrZbLVNUHE2VWKizvIEUXWDSV3SjDQ/PImA9/HWzJ14iPj56JowetBTqRHGijc1HC5fpIEgZhSRG+rhzkfQ0dryRBxPrIeGgTNN0akioLoaK4k7E7+ur28VEgHMyAZ+ULCjO6o9FiFvqY78vu9YpPl7xvLMjJFj78Xyq7NJnAhZgA== 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 DB9PR04MB8480.eurprd04.prod.outlook.com (2603:10a6:10:2c6::20) 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 06:39: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 06:39:39 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v2 13/32] selftests: mptcp: connect: print colored output Date: Tue, 14 Nov 2023 14:35:32 +0800 Message-Id: <0f93b016089cdde8f374389b3fc52a327d29a7a9.1699943337.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TYCP286CA0221.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:3c5::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_|DB9PR04MB8480:EE_ X-MS-Office365-Filtering-Correlation-Id: dc5a25fc-5129-4a44-622c-08dbe4dc79fc X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 0QpVqLVHgVJqODTiJXRaina0CN4rV/ayzcE0uFHbZeeNApHpnNekJ4CHXtHN7m8mOgLUK50u8kgdjzeJTcW5vAiLIgbPNe8UuH+KQyDMiCYMGyW91hw/19jtnops28Ect2QrrLU9cxy8G4bfJ07ZbN3quUm3AGAO3twd+mdNxKoY+BvJHKof9+CWd/0M7PPrCXIX8Vd9ug7xU1OjxhqeA/k5WRfNI7YHrYnQLCFE59jou73IwCQHm40RRpBYMsps/pCqqwyYtBlVAn0Yw1Kq23UOdKNWlzLBPap4mCumqka6ofgwgI+4dLTR1sgOH5tB22x9BvGNjrPofKqtRzV9iw4/h/z3UNtgigOVM83h6tw7nvW6EycmfxQMhbUMagVTM+nSPT+CMXw0NxJgjAJyjyNS1IK75RTN8PiTeoKFO1P9qPqDjAJrsuBjKJIlZC5u9laGXYNVKqvOFBAGXA2hMuH+RhnWTLLVjtwiQ/3I1tnztyzrQnJNx9ZQGxVv24QuL1uuvDIOCLRVu/fJoFhAUbbeSP8AvWVWxAE8NfRKIb+B6RYRiJ90LBTGVlUVf6nK 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)(346002)(376002)(39860400002)(396003)(366004)(136003)(230922051799003)(1800799009)(64100799003)(451199024)(186009)(2906002)(41300700001)(38100700002)(66476007)(66556008)(478600001)(6486002)(86362001)(66946007)(6512007)(2616005)(26005)(107886003)(6506007)(6666004)(83380400001)(8936002)(8676002)(4326008)(44832011)(5660300002)(316002)(36756003)(6916009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?fViac5xwxw+GhKkyfw2N1Jzwc4qHWxNFr97InT6ZwinkMugTHYRNkT/F8YDm?= =?us-ascii?Q?bvR50yxx7XwWmLYcaIVcHSAqfrFwcpYgeQG9qfnvN7yyoxdzRXLdlGamwYjV?= =?us-ascii?Q?wKj5OQtL2lSbhnojUzuqBywcuzKJwS6SQJtu+vwq/lcqd4/mS4J7C1tFoWDH?= =?us-ascii?Q?iT8hCpovKRN44SGPHmm0rPavOCnNLQlklfYTlwPNehuHedp7ldsp/aWVdE1g?= =?us-ascii?Q?TVHjf+Kjsdz1fsPrw0aI1ZX47+AgE1gTPTAw00EIQam0ioJcBtY3GPSDCV9a?= =?us-ascii?Q?TWBYhSiBZf9EyiOT8fGaogqGcHk1xwQKWLavkWOBOdosS4iyeNZBHfDr5lAF?= =?us-ascii?Q?PXCff8z/jYp/6Z9C0GrAXd8sQw3P4D1szIkW+M2p2Ow3xSqRlG79+rEGFV60?= =?us-ascii?Q?qjSrj6Bl7rz/1jVskqGjir/ARfw+JPCkag3Dl1CldM2dZxNu1JF/KHwVXZFx?= =?us-ascii?Q?gDrMsWVMv0BTdySkpS4KmAbtk7nQI7mT3nkCYIvVl00SEuQ9Po8vCK6KVRxi?= =?us-ascii?Q?aqzIpTofX6KT+RWz4076nRjBak9KyHgNIOOwK5Rqy1KIRUrN9IjeTYhMcc96?= =?us-ascii?Q?HYGC9EnO1NS3hhV9fzp02RYOKdepTNaB+LBtsR6Kob3PrIhwJivArIqD0YxB?= =?us-ascii?Q?s/9WMY4EKu3FQ0PsC6M2cWd2Dn01Xb/NMDjJaLzO9XJH0Ij772twp1kxUDxl?= =?us-ascii?Q?10gpZ5WyP+e6Jkon56ylUQzR0OmrpwhX3xhCABHCVpfQQ0V2c1EMKn6vi2o5?= =?us-ascii?Q?Fg39G0GKBLPMpOFY4Uz/6HxGPZE3WRghVGI7eld+T7L1tyl73GIWE+PNCKvk?= =?us-ascii?Q?2Vgbf7h/SvXBzX5Ef3zJUZGW0aK5hEHd9Hr/1B7V0gDm5q225rfTCnsQG3sS?= =?us-ascii?Q?ANOMawvDq+KGMMVQQhGokVlcB60JZSf1CYl6dgkyh4asCU0G08F5JIbOcQXK?= =?us-ascii?Q?W8gtx470cXMybp1uSq/GsKBUJBP1vkoqPsXYFTwgWVT7mig7JXm9RemB2rDu?= =?us-ascii?Q?aKmkxbh02vvhN+dju2Ir8MEFK9Y54CMNvGASJGPWf7bnIGA3bN7o5jvCWY79?= =?us-ascii?Q?AxLiHWZmjZ1Qzrwvp52iWy4u6ctuPECpIyGo+2RWWHfdb8/wMrb/ElvqQ77R?= =?us-ascii?Q?dB8f6ue3JZ8V60bJvyXz/UzUfTlK/kj19iin3QHcqZ1214cz9anjG7En7lLb?= =?us-ascii?Q?emeovm/asAol85/mbtvFu+tuc7H2MJ3JwL3BV76UQ7CGlyG8enln0+UPQZoj?= =?us-ascii?Q?hHTtBdyXuatBlzTfupJ1KiPI+cbAOdfYvRerCZE20QE9atmRAmOEYiR2XSuW?= =?us-ascii?Q?cOtYgDLMIlh0jUNIMRNADu7K5blAXryZmvmZlCivxY+GKb0vQ9Y+uE9MLCIy?= =?us-ascii?Q?Nks2OH0eMB6FcLwkjbAEonpctW/XQG6aZp2wrzkAK0SjC1g6QngyDh85+VZB?= =?us-ascii?Q?gF/6YKcMrvIj2DCQvknoV/5gDnpYBruJNa5veGCZni0mL86a0MfGjVAWfi4O?= =?us-ascii?Q?YCkzESvW5Y1xmAM3r7sMXedJxE2hopLe3zRbbn1PLUJisX8YK6KgFsLBQ501?= =?us-ascii?Q?v35pH/ZtLUEq4s05bde8EfcD+OE2a0KOb6LekGHK?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: dc5a25fc-5129-4a44-622c-08dbe4dc79fc X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Nov 2023 06:39:39.7302 (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: oG65tn2Z2j5pzZiMrdBhjszGjLfJSXF0UL+Okg7fmAxvSaiGTsVdM7JDtYHzGMhQM/T3kKr9EVsrMmCzU1Czvg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR04MB8480 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 15:08:21 2024 Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-db5eur01on2087.outbound.protection.outlook.com [40.107.15.87]) (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 684A52F29 for ; Tue, 14 Nov 2023 06:39: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="X0RpaZdb" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=iiEbv1PzbPvgBR5pTbznNNGFje5GrLmooEm0iRbqw4GQ6fX/ZTJQ2qAqT3BZse43oCH+4MN/7h2rtVotPt8rmN5Deat/DeE7ig7/XBeOdJU3gErtkY1cPBPpD15pPLlDCZO2MJPsqgbhJfIWuaerz93EPXOWr0770qmdSlnrAs42HlS0THQIqMjPBtqLkE8+DlCx2iTqaJTIZ8Et8j4fjgtmVpIH7yK2vOfm2bLsT2UAZBcgn3Nm0pkQu6LT1GiypFnVNXzvz/LkzjhqhLN2pNabtR7K7SR2Cj6mh4Zp82BzNNar1N2PSnnzvzZTppDFmeB+0TZH4TltyEiaaXjnxQ== 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=ccaG27FOV/OwyvphOdyDTVlnl8TbvAs60FOM1uraywlgrGjL0Cdwmv3rejyunqzwcvF1sxKs79PU8OXZHxV3ze0GkYx6kunBxz9uzhLJEf/TtEg7OjWf3uvKDOQZSwHSFPosd24+c+aDmWEcvSOpHSvRcH2I+NFy1Rzn9Tna4AaBAbaFyw+vu3xnMNtzeKLo2Kw1KHOidXSOxwDBAxWROEs0upNUq8v7bt6bQ9TPC5bX5Xmo+6A2LzCSpM2o/vT2XhfAipH82wTNuV4iJTeTb2EcAyQNpsyQGzX6qJsjZ/x2YiX4+0ejv0vn5SYICsuzBoRG2QEaG38PogkmV5CTcQ== 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=X0RpaZdbkOgW8pdjMy512HLxv6rfiOH++osexaI5O7FbKNnlip9wRV+Mdkl1n5XkpXBk03bfAxDGRWMEtPYkOvDEN7lfzZOwzu6HOQDrK2g0/NDQYJFWTUmQoQyokMuiKhDX5PB2RFBSChX9yzDY+bs5CLRbNHU4Wv4uUDet6tE9WqbR09xflvAWlT8+YKfZooSUyh3vtValt6IXzdYtApHlbFKbjfe9EtQESHC1ZHBAKQBxwNdSFQxnLRfqkco6NWqqqgKkvn+F5CfM8iT0VBe1RDLXEzLExherz/6siCL4iI7/Bqh2N4AhsTVwUeN0mmyCQG1hso39xYRalk6tyA== 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 DB9PR04MB8480.eurprd04.prod.outlook.com (2603:10a6:10:2c6::20) 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 06:39: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 06:39:45 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v2 14/32] selftests: mptcp: sockopt: print every test result Date: Tue, 14 Nov 2023 14:35:33 +0800 Message-Id: X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TYCP286CA0213.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:3c5::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_|DB9PR04MB8480:EE_ X-MS-Office365-Filtering-Correlation-Id: 23d30b48-8bc7-45f4-5ae1-08dbe4dc7da5 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: zHRDyNIy3kYLeeFDdMF22Px9U8Cp7QxeBVAFHNFVIo0vQ+aYOwXFt7e52Y3Kiogz9NK5A97nGKSFnOiLKlgzrGRVD91bXul+aZ03WDvxdJsHlla+BNSEePoQ15RIjuybYL5oFE5YAkpolXIAA5T6cEJmRt/wddAfqxzuMgpbLbYApiHTVVyW9d5DphW7k3GgZv1ndjVCvWOrm5jbfa1Ns+OY+7CWH7pjjMvlgldP9sztqAC8rj0cpqnRvRlICOwxELdQ+oH6Aw8WQ+JjEbvQ74kg3Jb7i/qIaruJmKAgG6SDiZGRQw4dWwBp7cbJk8aAa2gfZwy7Sxs533LHA26yCxlSMCYbz6Y17EXnl21NMx3cdr5Mm5Lu9Gdn+oufRNmEAmQh/vO8f0A8AZE3UGbG8kHyonciViKtAOuTudI04Nf+zNE9MvON3q1463vDt3Hka04y0KEOl3LCV2CwnW5xTBVgLBIfwHLnYoFMWPY9ofNRrDwoQdDt4htXCk2JK9vbU19CNIu8IivyAh559ItszUz6+Xn86BBhfBHqJzBL/805xLe4dTrp64XqVBxcs3OF 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)(346002)(376002)(39860400002)(396003)(366004)(136003)(230922051799003)(1800799009)(64100799003)(451199024)(186009)(2906002)(41300700001)(38100700002)(66476007)(66556008)(478600001)(6486002)(86362001)(66946007)(6512007)(2616005)(26005)(107886003)(6506007)(6666004)(8936002)(8676002)(4326008)(44832011)(5660300002)(316002)(36756003)(6916009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?0Q4UI8BrsqRwCJQLv0CvMSvacrlr1sdRAa+LxuuL+bMpm3KxmEnAHm56wXoE?= =?us-ascii?Q?9NxXSREOgiHabBJBL2AlvCRy3VOX2sDwGztd7Imum//X0QVJtLHVHAaFwCet?= =?us-ascii?Q?kI5+rRGtgAjqURzHC4LC0EFKoX/QefOV0VAZlOzGcss8u1W4V/o7L3sgRjt7?= =?us-ascii?Q?Zy4qWoK0+URJUN27sSjK1rZJN4d2C0gqiCrrSqEzr3mr/Y03y8FYmR57kFkU?= =?us-ascii?Q?AX9/iR4SdlLSPhdvdKNPzLmntqMI97P8QSIWHNt5YDqJEcwgTffDTrRcFuss?= =?us-ascii?Q?NSjM8TPU0jnQE0WdWn9K0vUZmFQ3XuKtkbWJpIVepa9eIiua/njkCewqYvCy?= =?us-ascii?Q?7c8vlTphinZia97CELWpPNSnvAz8bvaNeFFcJvEJBS2y1lg9YEBnzVpGTkpv?= =?us-ascii?Q?8NWC5IKL4HV15ng+oukpmaMzM9dw5AY4Jva2g7PBp85fuzMrWtowLHT0VFPf?= =?us-ascii?Q?zwS26zQQfYAGd2OdHZzw7ivTgjEPt2Dumg1cYoa8qk54QraitilxzmoIOwRx?= =?us-ascii?Q?sGKLntK0hxcjGv2LABtuuNbbK69WnKVUqkTfIu6XWbcA19DkAA1MwuUfWyKF?= =?us-ascii?Q?uB4XrjAEO42Zds19r38G5D+1PA2JLZySaYBEvb5Tg45LGAcW7dqs3HphA17m?= =?us-ascii?Q?WM12wG//b9M9J6hgVO7SpgYb16MdLAFA7Ijjfoz24K/UJTGeYmFHnD/x9T5v?= =?us-ascii?Q?K+PF+/Hk4emRtrQhvWgZ0WknJHS/MmTypPEOmGRrp4wZ0ZQH/4b2NJc3B41h?= =?us-ascii?Q?8T14O6XQ45l4ag14MfJcx2riZycsjelIu3Cj8RlysKXGGmaI4uKXGy+Tqwne?= =?us-ascii?Q?uCAVf1z4uVfjZ66ILuzY+NndfOmyu2302JljgzGhRyCtLAyiirQoGTJnffGy?= =?us-ascii?Q?mQkxAHSAfF3BycNd3qbzhpDRufUAZ+toJvhzOpZ+guaqtRWJIl2ALA/7kGxk?= =?us-ascii?Q?L7ZB4H8s4Hz+G1ZKIy5nakChuqwdy2n8biq7Mx+mefpIvWxbvFuhrBnolWz3?= =?us-ascii?Q?Pdw3f7kV/cOfq9UWfOnbZPxQnA201laXVkPeoJVRkGOkTJxE4MhNS1E2H1G7?= =?us-ascii?Q?Vpm7WncKuZBGSeh6lQtb8XKR4rJH16o4v4bbBy/bnYJT+jFKFj3K072mShDw?= =?us-ascii?Q?5xMm9+6TfB8ao2IiiHXaGW7hkpPrTqscNP4Xk3q0lyjrjwqx+XSkgnmyhBBD?= =?us-ascii?Q?tx2dMSmHKG1L7PyxqrIJhGFLhD6GxFbhVA/cRYF6xvVGO522i1HoPCvFn1zb?= =?us-ascii?Q?CM2cGDTq2dNxIukDuIItkjjNKYjqsSp3543kowqWtLFDk8sLtjFw48eEsz7/?= =?us-ascii?Q?mkon4Rea+YAo7rAwFSWIn7xOCb6nvI/GXCbme0y8dJuIjGj0tPQ3FBMNtbva?= =?us-ascii?Q?jLmvHsvSAn60xsQwh5YlFopmCaNJhqKucoV0qIvHqBO6Ugow6U/WiRUOoZ35?= =?us-ascii?Q?CIOkei6a7NHtC7Lh8L1+Z/JlBPgU2W4qe1d317x8AWlNRR9tdsvvDQag8rtI?= =?us-ascii?Q?8x9rXGJtrjo/RhLNno36QYcbKUIyYrgCJDNS1ZYAy2V+AQaOfbe6iq0rgJoW?= =?us-ascii?Q?AIVLjKw2Oo55UubQdQNM6gANAn7xDEzz743js1+m?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 23d30b48-8bc7-45f4-5ae1-08dbe4dc7da5 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Nov 2023 06:39:45.8474 (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: xkVuzCOLurFLmMH3YnhoJl487EyJy3s/xZ+181hXaYB8VwFUdZwhOJ7sDUMERPBYk+0FgEVbPLFWZxgPq3LmXw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR04MB8480 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 15:08:21 2024 Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-db5eur01on2041.outbound.protection.outlook.com [40.107.15.41]) (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 7FC97612A for ; Tue, 14 Nov 2023 06:39:55 +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="v2yjGATC" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=lTYwZYvOfPDk8Fa1OZjQwTYFh6OXTRT3fF1VFnWRq7UVAMe0Rczs0m+SS79HuzdnH4mmeqQDzzjuYKUrbXoFt/M8RVMVqgRb6DlfnItl9RK2G/vh8QiF4PpQkb9STypCVqtFx3+iYb9bJ3N+mYU6Hagi0NyhbFO/RvcLJo6YEbQLtE0k38Obz2sIOFNIe/m9oSz3jprQOrxenDAxSGD4zcdyde4j5K8R8gLA2jmA+xd4VBNglHMaymrBvZfOthfglSg5K1MsaPAkS538Daw+qIKXru2F1hhbpWUOd4gAcXhrWrvXG98TnHuh56+4FqPE4F2SG+sEM1QhWSQh1aDdxA== 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=RIawFyWq5hHyuvYlG8fRfTDjcf/uVmWDJsmqbhPhYvAOgRWTOg7tJMEJr3XK3wxUVgB10Sh1em2kmFZB3UmWqneDwfw0azF+Y3ZqBKMdbYPzNF6Qoire3OjnZq8XIWvf/U+Sg39F1/xRVhd1wJSW7E8IsnP+/K31HW3mHYzzY21KwDyxiHBjCTojZ00J5F5KRfLMaADzCy6cg/loa2yC2mZaqL1wpq7oiQWFv+BPkmy4q0GijaOd+jZg500dSxQ5bno4/Q+6PNkNJI40sNoFopXpJgoNaa+M8VTzL3YrZt6i9pSPR5mXZ/0gfK7Lkzbcgr9TfbLMZAaGkrJnwDw1QA== 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=v2yjGATCgVhPag/s+78F4lWQHEUE7otJU6L6lbllXEjaWYD7iE1Gh/y/Usaneny6c8XRYXLNwPxpDHIZ30is9Z24SZHLXLYDZKQP2lshX4Sty5xyTrv6Cee1FnQmNLSaZLVj1wKE6SQ88kxQdHJ9YaPiGciobiZ6P+aB+bUiUwtNeC3w6FgW1eXXz2XL8sTs3LOCntlXPa5UbVRAsO9Jmbp9ModUK8ht1z/688drzK5pt97zMYlgLt9ysfmxExyPZI71LSGN86I7V9U3n7V8RwxplrAGurfQ8woB7NfxLZbqgzxkOwuAVdMhfLPg28/SQRanXLyznL3KhK9IKxV79Q== 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 DB9PR04MB8480.eurprd04.prod.outlook.com (2603:10a6:10:2c6::20) 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 06:39:53 +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 06:39:52 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v2 15/32] selftests: mptcp: sockopt: print colored output Date: Tue, 14 Nov 2023 14:35:34 +0800 Message-Id: X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI2PR02CA0022.apcprd02.prod.outlook.com (2603:1096:4:195::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_|DB9PR04MB8480:EE_ X-MS-Office365-Filtering-Correlation-Id: 97aa20ab-db6d-464c-5f48-08dbe4dc81fc X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 1UqYOZT85WjCQ/RS8vD7bX3XvsUMoUp7gatiGgsyvypEFsvZR1bxpd3OiOOiLqIYYm1pHJKUzgRYhcv2DXhna/iAl9A+yGiJzuvqwxXezscL7uNWOijT/yFdrSG8ALjfvdLRgKRanLYjqIGBA5FdpPpj4oTtmTCFL0wDfblCJ/loMZ1O6pN0GJwAyHgvsRIr3Ki1ad9YTpR/OhTsuGIYAwyA9JZdaI1ZgAxWC4pPhmprvKevrhp0VBS2kJAdJCtUgRvUHvEZiDNoTW2GOIlqnu4TX+QLHgvk15QCZ14osgHuydBoi1hn+IgJOxKYybLPaxgLnBMmdtfXFJLXkgaavjg37ecuubtPD0BUsLZRge3dLAELNgrWK496d612beq6xmzwyfIWr3OE6OoZBJhj7FNmjUwAZyiLsg0cvkJnFXUuS6ddGiGKTdrD0OSh4MarLYxfxBxOCI6p36DHGZZGqxFuA/WuhM8YjN89g2GKABY2H0rLHNbATaQkr20nV67kbgyc5bbq+t34kw0tU97goXI+OWhAgay5fmDqcWIZtux31jgOwHRBdjYAjN2ETzdo 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)(346002)(376002)(39860400002)(396003)(366004)(136003)(230922051799003)(1800799009)(64100799003)(451199024)(186009)(2906002)(41300700001)(38100700002)(66476007)(66556008)(478600001)(6486002)(86362001)(66946007)(6512007)(2616005)(26005)(107886003)(6506007)(6666004)(83380400001)(8936002)(8676002)(4326008)(44832011)(5660300002)(316002)(36756003)(6916009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?r8qoCJNnUkX4GK5Q4OxLzWcJi8Rn2+LFoZrWjVxJkohdpVkij74gWfzj5JCY?= =?us-ascii?Q?U0CnGFeac5QfryFkJgFrEA+aZooYxpz2mu3DvVq/Jtm3FStO7hLJ4VSY0yBP?= =?us-ascii?Q?EVF0varFNvkjOj6DEmh4btc57X9/kg3WMFE+PQhWo2KqR5hsUNXsKHsMxkkf?= =?us-ascii?Q?90Tvmo1WFnrltAZkNTZSMpL9fsotMfpNV73qvrKAW8xednillPfumD6fR1XZ?= =?us-ascii?Q?4Ls5sMI8qpyOnz4Rpr+1ck6ZWpYHKDPWwPq4hmVepp9FitoLNj8LyMRjl363?= =?us-ascii?Q?089jzejXyofcNvnE+oBKHTCkPwu5JHj5A0tFboylUD51hAMg8PWJjC8ZgMGE?= =?us-ascii?Q?K12m/AnVtmrCW9TsM9ZuAvRZh8pxE02zS3wOR51iBPAeDbZymquj7gm96XRd?= =?us-ascii?Q?2rfke5amj+OHtsrWXHovOej8hxtyeRpK8IIOIc6eZtTFz4O3U2czy+T5hSaf?= =?us-ascii?Q?o1vR2boejhyOsnifebY3e+BiGoPtW2njnf9ci9itG3xveYauWXVIhYnmJVAd?= =?us-ascii?Q?dgqKCvsx1gbPFpjb6ZgvPiygBAhYJa6vFtZDq0wOmx0hGm8l4UjnaZ+OCfEp?= =?us-ascii?Q?aBi6skJpmlDKBij7PbsPIBvwT4qsLp71H6piJFBNiDR326xi2VC8WuWnDKS9?= =?us-ascii?Q?VOnWGvunYbrZFWfLdymmeRN/4xgqxd3a6LioXCB3kEaCLhJDS7e3mz/1IMZB?= =?us-ascii?Q?k3PvH8nVGsBgApPQSORXh+eN9SZQZBu3qOmqzwFNEU3MCWuFM9TqbExP51X7?= =?us-ascii?Q?ObI5ivZCmnTrJUKtDRein1d519Ld4Knidw4/4d6LSOjsxyYQE00ZNwzfXYMj?= =?us-ascii?Q?0X65wr+8STZ4CKACJk7Op9uPJO+AJQZVM/gSGKNqK5/QwNp++WPyo4mboVbU?= =?us-ascii?Q?T8pv2h8IROox8gWR4+rkiwLM6xhDcq6Ut4xrxYtvp0e0ddBuImKIDMgibKn+?= =?us-ascii?Q?UyCLqnUtHu40qCE9oxyAIzG4nsC5HL9iy5KzODE6x1Hz4fddJoTJe2MmdPji?= =?us-ascii?Q?kglLOdwaEujrzy0wMyQQa/qwx/Ckb+pR+h7jvY0rnKFXF2q3So8GgLa4YUlq?= =?us-ascii?Q?DoeHL2F9Wy0U3FtrkTBfz/JhE/uMS9A7r5wAZVff3cXad0x6OlS6O8RhAUCC?= =?us-ascii?Q?QNwZVXWVMSYwv6OoGsIjrBFGVdNVc1XXMVZTqQS/zaikTrJeAC9WIytXOBZk?= =?us-ascii?Q?xnW3/RcLdfK3UDtFd5Gb57eZjzqwq+PL7phrILhu6ytQloyqdGa5OibyqVad?= =?us-ascii?Q?bxUyi2xHodbJ32LQi4PUmAFDRed9KEp/bQHEEY35jG2IGRWoggJ5+l6cdqw7?= =?us-ascii?Q?eKlBGyve7+tUdiGztmjif9bmUpPQ9EdkP0Ne5wtpSOnJbmFHI4gaubK9f0Z4?= =?us-ascii?Q?PVRBvRL/mIeYpFwjXZFPSfGSMoMi2LlYsPqNt7vRMsysRIjTmrE7qojlCvV8?= =?us-ascii?Q?wBxIr9kXiTjn5xoThJxLCPjlpQC7nRR25bvLm1wjlI5A4jnYPp6PAGzCWRe4?= =?us-ascii?Q?ADVPsJoCShybE9qGZTFf1SIQuc4NAndAPO+9RRXmi471+Ylfg2iIU5err4ay?= =?us-ascii?Q?kkWbIL9L6lyKNZrtFQ0NfaBBFoJw5orK4an1Dyhy?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 97aa20ab-db6d-464c-5f48-08dbe4dc81fc X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Nov 2023 06:39:52.8995 (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: fM0+sX03S0dnPeDoGiK3JYCDxkfXzax+rGo2zFI/Sg2oGf+E0zFm68K958CIy7KAp0FN2+4xMtX8ndYVPUgQaw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR04MB8480 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 15:08:21 2024 Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on2070.outbound.protection.outlook.com [40.107.22.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 1B791612D for ; Tue, 14 Nov 2023 06:40:03 +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="L0GA1XZt" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=I7NhyG3cWFX9Kbu236P4KFoWWsHhSZgk6hn+rlybN/umEpbEO76fDvHVKi873uOmDdo4HD9QO7pP69k1w/rg6iyJvuRFiRx8VRwSEGM1bCSmsvMmBjsnCUbiCAz+c4a4EIO04wti77tff7kzvtfV9vCZ6bOCjrdNKZj1BzvgBgeITBfUbadHvnEwMd409crjmWKP9wxMNyAPYVAuoY1dQy4VRynlzf4bs21gWSmd/AuXhHFLMCwQ8uLPjpOQUOQbXYLS/IgCTHWqlHrJ5AzebT2mpX+SBcP7MUYNODo5f/Pu1L/r63Q0QtRkwRaZ0S7kZwMuurmuHIiGZOthPPVGUQ== 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=Jqksg1kbw5+u5gQ7MM6RbfH79hA9TJ4xDb/HMlzupzpI97seY6+/3e+vBnU+pUpHpErLhE8x5O0vWI8O78UMe0CtzS55tOnNWxIuBklyj/WjBn0X17yt6Q6g7EAvdBv/43JmVDE1H1IWkAbioi0nqjfCY6jodkM5wPcwyF/Ogx0jcGgq4M30Q9oEJmO7BAgwlo1NhxaFWKozkLKyI8Z7eWMotsptO3FUMsDct/nYO5R/p+VTG98UEC4thyjbUVZMF6YkCKLKZyzxV5uZo/uHCBMZhQjW9J7BJTkRjT8yKMeX8/JGm9F+xItR28W6Yi8ilDKpIdnwtBTvjkhAyncLDg== 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=L0GA1XZtgupJ5C8o4NFmLW5yLrSXwtekFzOrNKT06FIf8sVfZ8iuqcpeNJXUfy1nEu5rWbeCJltOICMbd2N5fb6lY3O+64/0Ag+xSNLHB9sZOnRo03/46/otOpETwImIqbJTviruLv81omaDXeV988j7cTPPOx8tI9UPvtBqE1t0jA+Vh3e/20GoGXFiPJaobGVe0ozO9y4XWHOz3vMAVpYOF1uw0U9SsuERi+s0d4kAa5bEw7pJ5isIPwSTPyY1ntYE4MRBUF/KfbUDvSbF51AsqB1H6i+vT47ksUY42PjPDRBJohWMVxicNWAyGDULH6UUo8gRKcLfba5XTT6ozg== 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 AS8PR04MB8932.eurprd04.prod.outlook.com (2603:10a6:20b:42f::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 06:40: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 06:40:00 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v2 16/32] selftests: mptcp: simult_flows: print colored output Date: Tue, 14 Nov 2023 14:35:35 +0800 Message-Id: X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI2PR02CA0024.apcprd02.prod.outlook.com (2603:1096:4:195::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_|AS8PR04MB8932:EE_ X-MS-Office365-Filtering-Correlation-Id: c86fe163-2cf0-485d-ee95-08dbe4dc863d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: RZd9gRdYkPOZ0vMZc0ZlgDU00yH/VOjfPUHgNb8A3BXHYNHQyIl8a6J0160aZFinMtGDwkLcHzuESIVul0WUo64AVLGDloImRuTTpY89mKsRidzIKDNj9Vt5NG4ZOccnrL7hgRiz49OvqkD53y6YpquTqGAoCVOefV7C7x1vva6+6YHBj4fOm6EBREEkpPzdK1dkbVTKxEEp4Fz0ejpYO+6lEq5b9h3USz0DD9DCoAb+zA+11vQzO2b2sqUGuPNoYvWcsQEs9Bg0gyP6eBZyaER+GSp8Qa5ZL7nDNDLKTu2x9k5+4Gw/4kRclXPaCHJ2J9w6w6z6YHc/e/fzRI5Dxd90rdNhssP4xH6ZhEoEaI9Mp3DbOq0WDUa4RVHWdybYBgQkOf+G3tuAQx4dyc7p1V23ckD6QVUSZv8ItYeHnjQaSpV2vO5dZ1AHnUeaVqr4FpSbqUBE0wYFo5W8bXrKYzgP+42JL1crXvnWwZBcOATHBD1lgp4BcaEaPuQ9sRQFcaKQZaTb1jzlVwL/vxCAhwULumCuakQhFD47ShpZLhVNWcbZKpO/tplMXsawWeNM 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)(346002)(136003)(396003)(376002)(366004)(230922051799003)(451199024)(1800799009)(64100799003)(186009)(107886003)(5660300002)(2616005)(26005)(6506007)(6512007)(44832011)(6666004)(83380400001)(2906002)(478600001)(41300700001)(6916009)(66946007)(36756003)(316002)(66476007)(66556008)(8936002)(4326008)(8676002)(6486002)(86362001)(38100700002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?mfm5dHesJ7dsZ/IYg48hfnQcgXjruV/vmHiAAX7bhSeQK5qJXluZwBligELg?= =?us-ascii?Q?ihsGgEM7YsIuKIjpKaRNlsI9QnCqjCjBy3OeCfIcQB9cc+OP85a4cXje594d?= =?us-ascii?Q?nZQwUpcGFp6Rv1sFmWKecEPAhGiwblpM7B/WtZWcq7/dTPjrezU/W0ClpxcL?= =?us-ascii?Q?OQp5I+0YxT+rjAzADJh9ZwO/SqwogdJp0mFcTAznD+5cGVslKeXWzpreBTj2?= =?us-ascii?Q?VAYYyt5QGd06/161jUtc2ap4u18viVHfTxKMU4VWOXdY+JLwTxJAj1sxdoYb?= =?us-ascii?Q?1AxC51pWHMlREUZ+rce2AvnDBAHNPkn4y0BueC0x8D8oeSMMiRk4ilnt4uCO?= =?us-ascii?Q?DsGV7WN3RfGVL6VjXVOjzu7cUC97Yn27eR8TDDFd94CzvqPcTJW1nFORL5Aw?= =?us-ascii?Q?FvRL1AcD3T8/0Pgu4iMXKjK+lpI17103Gb4qDEAU1HtQCuzfFWEz985ZvAgD?= =?us-ascii?Q?OPi8xs8S2lUwkmB6iD8DvOhzWZwMvYD1VZpNKQGj0QyTmgG0XpYY+vHAuamQ?= =?us-ascii?Q?YsOaHTzekDQI+x94fS7YUlq3aC8HqEb10l+XIfbyHEcyF3wUS1TIv7Rmdmfd?= =?us-ascii?Q?gBL5qNbpDu1crcgWH0/pwkL0IAjeIkekHQtDvhPqWOGS0xL6cG6hZxIhDjG+?= =?us-ascii?Q?DhJPA/rLvVYju9HWKVh/vdUymiJ9zH3vweo/QnkEzLTKz+wen6XAPGwfR98Z?= =?us-ascii?Q?cejHuj2b+I9flAWjZroNckFWhi8Hn06PcfxWM9OTeC64CbtoX15YyRIVls9A?= =?us-ascii?Q?Y5/cqSenB/Yu8ooHq0nC432+2HBBliTaRFJmRlqWWbG1tZQW9YrxQh2RiTLX?= =?us-ascii?Q?IpySPYZQ6XvJCWNydAaJAwtnr04Q4CDGjtQ3j/Jzh3isr/pfug8Kesa9z9zl?= =?us-ascii?Q?CQl5bh2tsfFhYU6RzoyVGXZrPUMrL/2v3j0AtDi/O5BA81vvyYtKtG4j9yVq?= =?us-ascii?Q?TlQXuOz2p/Tp30i2vUMIm/xrWyylkIaCVd5uksM3GBCo80tXClcx4bQtw/ZO?= =?us-ascii?Q?RLwEmYFZDOpTZM2a9GeuK61C1+H/QpB1dP4GYzfTfFFId/3KEmQV/Gz9giTF?= =?us-ascii?Q?GG3nQ5gRxK9/J0+K4BpTxgN70blF01TWS+eSr3ujlzNJzjrdrvgAc4Vw95ii?= =?us-ascii?Q?uJVCNvpGq/R9QJzAW03p8+1EU4DR0et3g6DrNebaOylzp8z+1y7EwSj3cpOT?= =?us-ascii?Q?VYhFmp1BGWEEvcQT/9hRQBfalsvF5VvyV0gJJZy6KezGEBfWRS/0E3BQ9SKs?= =?us-ascii?Q?BuEO50g2vIseTHWFcgETdc8mRKnrHFTTWBdxI+aamFYMq1K8nmSrAxC9H/E3?= =?us-ascii?Q?taRDBVk6mTjWxwdqyqI/uASHMPCf9Z7ts/FdD6oYAUdMkIDxZ6Ep0qeQx202?= =?us-ascii?Q?42ime0rEYLYsAux41pRoIvUcmhepQS7bpg0DM2dM8G5zuRE3yQxe480/bmDZ?= =?us-ascii?Q?3Z+kZagk19T2z9qgHRZjYeKQ7tK+W2RpYsGsQOPrPaBfvC5D8wHg8CExo/4D?= =?us-ascii?Q?Goaw27i4XVJapOfD7G5dDc2LGRQO0ZvZLi/4kupqNt5q9L6DfsXmMzKoCE8g?= =?us-ascii?Q?5AU1sTCF6O884PEvgIJTlxsU0UHc2HUdjcNiYQmu?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: c86fe163-2cf0-485d-ee95-08dbe4dc863d X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Nov 2023 06:40:00.0111 (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: FAgowdJaCkwqy3tsohConQMrPosD55Akr2Sk5IfuYwmTb7zlfzBCieKbF+wbCbCJLbIWC67HFu5nQbMbfP/TsQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB8932 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 15:08:21 2024 Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on2088.outbound.protection.outlook.com [40.107.22.88]) (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 EDD89612A for ; Tue, 14 Nov 2023 06:40: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="5pS7MpvL" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Z4XqSv3GjegTydPALCqK6+392zOFOWlbzL6JsSwSh6sJ62mmZ0/JsTtLIYSAia8S3sdZPj4BoZ4c5m/xh03NW4rWsWwa+9CfIIyt7KRuBsQ5hnPUYwTgEVMEhi+9RVK4ULfYNkbwyYtugqnB1l/01Jj6m8t1hanzx323h1CIO0Ge6LdhWgOTXs0CxauRVrgBwgiAKz3I4jpBzMFGGd/0AZx2PM6lG+jsOf2I/R00gwFp37UKhV5oMOZ00ZZ7JUg/mV2ppkRRF/gEiFxlf3OaG1hC/+x2lZ3Zt2jSzAKpUeaoZyUyiJVTsFGcAo31EJC7N4ITj5eTIg48c4vbxj0ZdQ== 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=NHG/TlU+3EI9Vl14VmJpKHo3aw5N/phjobIdgLeKm0SCU6kNR9cJFtReggfz/tMJeOtplJxK0S5FFTY6cztH80on+UA9Rj6AsKKXO9DWUK6yY7Ok8DqsRdopsd1QTCTlp7d6lcsaX3hUCkfEnLGUfY2Zw6fku6ScjRtEcboO3v6pYgOTuTtNTJbKmZbgp2SHUFtJr3h6WzplIodvnyyVTRw5+6SZ7pofRehHBaky2XVrqDWYTmGinNFnatg+Zt0CI2umXaMD67pKyTdeATz/cmsmy43wVqthTQK3q9vRVMxi+PfjwZq9M6UNg4WpAPayclq8iY0l8MMF/X4H+xFhow== 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=5pS7MpvLieiR1ozfg1zdURaJYtAuP7kAcroI4YMRrBJuz7RXzUrd94tR0Hi2fw8Ffl2/KHHOFCnH6Hmk61DiXd4pjUde/UPdCNjhFdIzu8UJwCTiod470ouKiPlbn7OkSuwDR0go0Spz//+TsxikTm/lbr/iN/EI9yR/A7J4ElJ33Wg5zouaHRAm57FAVjkez7YheS6xgTnwLq/lRkdBP35HJb+PZMMGfOwLbFNwQOwn53Kv9176J+1fSdZoXpT7u/AIiM3fBeAtFdzdKeY9qqAo+4J9phHuLWK3UdtFBFsK+Bw1D6PT48oeE7pICH03rs3vHTaiwIXzldbRO6WM9A== 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 AS8PR04MB8932.eurprd04.prod.outlook.com (2603:10a6:20b:42f::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 06:40: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 06:40:07 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v2 17/32] selftests: mptcp: add PORT instead of TEST_COUNT Date: Tue, 14 Nov 2023 14:35:36 +0800 Message-Id: X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SG2PR02CA0083.apcprd02.prod.outlook.com (2603:1096:4:90::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_|AS8PR04MB8932:EE_ X-MS-Office365-Filtering-Correlation-Id: b129602d-88e7-4a25-8f34-08dbe4dc8ab1 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Y+qWNoWrj9Lq8yFo3hk3QPCS+kGBoUg97WVT4d+CaUzIGea+kCUGqWfYN//0LxjUrMZlema2gWQdgiX47s9KtB0z2JuaMt6u5QToKvi5sIaFXm+dXqGR21KLUp5fPj7d5N7ONPzIQMsOnCNdFHf9n/fhHzTAHEcwBt8flIErreBENHDIv3Wh/rW837Hc8549nHd+Bi3z8f5hPpU+yi/aVLS5khqMMcnL1RUL09g/qDFMZX5gElZ6CrR5j/aGn2tkzhOBTFY83HWoQ2UwX0kstmwjNogUb+rf3FvrgP4EcdYYCCqsiIEBIjrfqMkU4/+oFvR2XKX4yScPYSuAnY463XzLD/CDW78bjzXvgBDBy9oAr9PbW1IPTEhyrQwEZV0BcVC1uWluhhXc0VvOHFOmgDYelV+eVCp8AkqElgTq3U8xoRxrC57WH/9ARfCSWFkcc05q/52RrtmLZAMUw8k1OvULy1jdxM9SfzpkgEe8Y5LMLuwJRYQURpB+9UkXe9GyRHghWPzs+pK3FR7+PjaAMrlBm6bCGOo1JFFNUG7wnp/aaabjlqHylgirmYJHJ7kf 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)(346002)(136003)(396003)(376002)(366004)(230922051799003)(451199024)(1800799009)(64100799003)(186009)(107886003)(5660300002)(2616005)(26005)(6506007)(6512007)(44832011)(6666004)(83380400001)(2906002)(478600001)(41300700001)(6916009)(66946007)(36756003)(316002)(66476007)(66556008)(8936002)(4326008)(8676002)(6486002)(86362001)(38100700002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?gnBUOYCMe1CGREJa7UzPjaSctbHWy/PrdApXTH8YFFpTjOStvaej2gN3d0Z+?= =?us-ascii?Q?BLDtct+7TM0KhX5M1LSqjZzdluaJcDU23YNA+gsyO27jVmicgN4sem/FFSb8?= =?us-ascii?Q?ipgTXwmyv8CkrIwimbhH4ZGYiKrzqQN3yqsjjWeXT9i1aI0HjkMwCcOML9Kk?= =?us-ascii?Q?G9wigzhkA45gHQPsSaxp6njP6b3GAAE9wHcAVyEXQht8SS0jOOU350sXy7b7?= =?us-ascii?Q?ie2EAT44kKwogO196hhJM+IPSUQ4ewxFF0CJJTG0Q9NeUk+hPLM43QE9CpDr?= =?us-ascii?Q?mlwOQtCCXulz7FcUlncjBVJgywTGjV5EQrcI8Eabi2Ai04X2hLzjbYlWJ8i1?= =?us-ascii?Q?y5WFhdE/pCLBqtfuwNGQgk+XlliewEEGkfbo63NvV9ktVg1ik+FTzvv7TGf/?= =?us-ascii?Q?BONNrCGM3JzF3n5ZvCNzcrtjLy5jLlHw23vrwS6rnqboPo+2opEenDqnEz+h?= =?us-ascii?Q?MXw8iJQKopJTx28+x080xYMctG3zG2fgKVh8BXHaj5Tr36SKr9HJvSgRTz/i?= =?us-ascii?Q?MjarCAc6ns/LTT/jP+y4aNEZQu6LAbadQzAJBEC4SoGCLX4eI05AoK/GuZ5i?= =?us-ascii?Q?r++sTzgpRlQkvp9dKlT0skH5xW6fDWS3p6cW1MCMTFPi8g5yqYRDic+EY0hi?= =?us-ascii?Q?hhgL08nupCh/IOTFJIHloS0Wbyu9Q05O1qJbBZNEORXX8XFvdpVaRaUl5OUd?= =?us-ascii?Q?ishrg62ZGwSajJ0dOcZ661s0AQFtsvTQx9DOZd1tcK/nWn36Rau2tDc3Tqm4?= =?us-ascii?Q?C02Y+D/Dp7JSnyvFsM1WNc4MKStTwxfWt1tAys4PKCNSS6ZjkgfMrE3aluVu?= =?us-ascii?Q?DqnuDa/vvCnKQvncyhpc+VZYDW+C6D61OLmzy5Vi37hsGKK8nJlO1UGztNkm?= =?us-ascii?Q?vmOrefth95988xDPZPp+eXVlz9cxQvIRn0Px09LnnYkrK4PLSkhuMEysswdL?= =?us-ascii?Q?QbDJmXIQP6B9cPekCBGRk6cIWDIRwi36EqonYy8ZNgZaqC5X0sKHPJ+tGfXo?= =?us-ascii?Q?AgXa4gHdyoh7/eSWIOK4lPDGLo9c+8XuwSowaAeqxZdw9nd/xxzrKkqquKcz?= =?us-ascii?Q?xl5mPQSpcAvks8Q0ekS2T1+ZT3Vdvab+gXtGbMZYwO4WdxyhIXMewSgyXeU/?= =?us-ascii?Q?ZgwuNecAIYKz9aeC2zqWAqwMcpOok88XZ1YbOcdAI9mGtdt50LVBylwR9tMC?= =?us-ascii?Q?gUT4BxOYDHyWwFEtmLI1QOLW51XJylt1+U8HCUVz0B/NLkKyeVdVPxf4HOun?= =?us-ascii?Q?HRTZSF1swJMpArNqhYLT2R3AoOC6VdFOGVz90PgLpQqvgXjbVVrSrA5mzXYF?= =?us-ascii?Q?w10wXPcLJ9qewAl6qFN9HtExbko25N5SO3xehRu+01m6x8+5euZJgXWu/Daf?= =?us-ascii?Q?dSCMdcVJgcXkmunas2NlnF69LUwya4xWKU9LrzH0w3f3W9zdLfg5uXjrvSr2?= =?us-ascii?Q?888eTcZMx80qk+ZLmsPBV38ng373DhsKgko13YbsZOB4fKKv6n2UfUugHksd?= =?us-ascii?Q?liJIBXmHIXmtiW9lElV/vj04/jmZDKD4NY45vZpAbqi/60aY85iL8/BTgFWr?= =?us-ascii?Q?WHtMfP41yotSNMuETia7ygmV/FdOOki8yhIJu3bs?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: b129602d-88e7-4a25-8f34-08dbe4dc8ab1 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Nov 2023 06:40:07.5003 (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: Br3IRP9uQcKz0IqxVKbsaHCtFllukgGp/C0P6f5g9nVkNMppUfED4T2uQG3/52JRHMg3L3gk9gGjOmF1tJ+ptA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB8932 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 15:08:21 2024 Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on2053.outbound.protection.outlook.com [40.107.22.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 5AB186133 for ; Tue, 14 Nov 2023 06:40:16 +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="DYJzJ+WB" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=STFPKlk1CW1DRbg4dxYVbBjUEJlGuyFoCEoxpMK51pvHwZpnvESi72pSi6S4T8JvzwNUG+y7eS4Ik+pX7HN47QtCPKuqQjE+NL3c4qNO4Nc46QinNgV/WUWgxqjbM5zr8RxJQPIX6eZ7DjxPQ4OedJ1IHpC4Vj0cjOOP+FCT9AFCOJbPhiLdsljwZYlTXMc+v1a++47SFehxUbkkj+hXRKTOmH/W5cxIFOqU0iVIIjh9/fAOPHJUGmAAI2Rw9PAAQlSMUEcJYIw9WiAFJemkU4k7teu3mcJPMSRiLxTgLQkATzEtCewJaWl5yUjshVJT1QiJ7bhahEzKNZ30GFakCQ== 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=m519DYip+19UbWasnAnu2JEAzB2nZ9Hf9atmXVDK/f0f1c3C/UBwLEVtcMW2ge/wEDqrOsq8HQfF+YPvoZK2gYlPxyXK9dxLRGxuQETz4xCaa9LQIo6iLxEDksvKU4T4keGBV6/RjniLKSRTbs9MN6Sb1acvoEwDC0RwiM5LEI8iBuMlEwcmfs8TUS4VvIRHJGLEwRHSd16gSr2h+oHkwDiEu9cWbOnt66vAai3Hbi90VwurVVIJoMOg4fh7Pt9/5JSzuMkjH7jfwf7eoIpczDGOuIGYQtcYcKfroZlVYge8bw9wjETY6OrTTUrxNkCYJhBFZEJHAUDU3bGCQoRg2Q== 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=DYJzJ+WBVaw8eK6LZ0/ZmK8G8PIq18cns9E+YLcAGQwosfjmVJ5NgMt1/iJdyJeI6XzyirLVjFIxKO73uaPSz5wdDdGUgC7VzDmnflc8yioX5ct5ZNN5EtXIDk4LN+01gVle6ViDbtZMloohEQp3PF4/2zBcWnBVK9O0IcnyLkUS7JB3mgAE/0UhFQ0k0i9jfm7NnKGKfwWRWBh03BjmDEOIudOdyRUGOE1462jGCdzrgAKaWL0wLiEokvf3Y7UzdQIQVfoS5VZwwY7IQeOPOrMgJig+Hp+7hwMZ+p0SQzoiIafBVGw6Aj+rmUoXWtC/nc5MbhS8+NyRXkLE66k72w== 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 AS8PR04MB8932.eurprd04.prod.outlook.com (2603:10a6:20b:42f::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 06:40:14 +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 06:40:13 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v2 18/32] selftests: mptcp: connect: print out test counter Date: Tue, 14 Nov 2023 14:35:37 +0800 Message-Id: <2fadb121dedf5b8ce4e0b8f850affbbf5040ad4f.1699943337.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SG2PR02CA0094.apcprd02.prod.outlook.com (2603:1096:4:90::34) 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_|AS8PR04MB8932:EE_ X-MS-Office365-Filtering-Correlation-Id: 3d44ebef-b0f6-4c9c-3a52-08dbe4dc8e4c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: rQf/+KlxD4Xe6gNmGbUHWmPpI39TK66iiG49GtzGI3D9gjKCnHp2lBK3blEMcqSzKyRA1aKQeX4UUW1SdV9cuMtS37BQ3FJlSQpmNO0Sxlp4aEkzKjagq/Yeac+LKpmXXFWTDd4/WhToaUweTcs5Gn+oXEw2kDdO17N/3h0K7jLfYbb2L3RS7nX7UMBock3Er6wgKTbviDK9KMni5frYPt8u3WdJ+441kpW7urJEx2g4WgkZu18LJwqJpTubiB8tjxkNH5nWMYVBAqraX0subU+lGO8J3f6FDWkefjRLQFl+2QoG1C6MruzyJPxXuEZlT6C9gxFQt0PKB44mUoHZ+xootLH45QlwoZeHqGykizUUkx9YVRkSCsXtNLpVEtdDZ8EPfie6yvza1+CwUs6myWOXavS0RtN9mXs3DHPowbLuXoHjXAbG+tAhKjcYYYiUPvEbFBGI0a36xuuxX38lA5m0GkIJHwz0A9yzNJMTeBQHEM8NxQfWZPYzHsZqAfTCeWrQq1YEnknjdO6xaB0td+UVuZuK6794NkPCfZH5iXNZPbPuMooCzyBHfeJrgaUP 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)(346002)(136003)(396003)(376002)(366004)(230922051799003)(451199024)(1800799009)(64100799003)(186009)(107886003)(5660300002)(2616005)(26005)(6506007)(6512007)(44832011)(6666004)(83380400001)(2906002)(478600001)(41300700001)(6916009)(66946007)(36756003)(316002)(66476007)(66556008)(8936002)(4326008)(8676002)(6486002)(86362001)(38100700002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?EwnoOprys0MQvslbGbOc00nIgy/aLNBO+WMseKln2FGDEuauDSyx/1W068QG?= =?us-ascii?Q?A9InpraHx4wMEyj2oPynFtAShN9HSz8VJknSIa1UvbnZq5ctQcphf1n6PBYw?= =?us-ascii?Q?+RUxEISKBhSKGTF0jlolYY6kK85XHPZi2SkMhNep0KIrJPqJGkgx79Bl6Hz/?= =?us-ascii?Q?Kg2Y5opFdbs4rrX+apN2H+qDkOMMcfCIBngGP/8PfP4MXgFOH1RzVCfcDpqy?= =?us-ascii?Q?NyTYVOuhS61sTmV7P46Ryziv2KfwGNiLK2oyfNhdbRBbThtziwYEmlHLZUWb?= =?us-ascii?Q?7a6gETx3o3RYyF4txcM4BqocnNrg/rUOeN/VgYagW61pxFeEPLW/mPayEUFA?= =?us-ascii?Q?tJ28ksGP3cEHIkR42G1S1uOLtBak3nRKu6UFK68cCxyIAbnZMKXp5T1D047+?= =?us-ascii?Q?v/JReBiKdqIaLQWTVbbwDp/CVKCmcGJoAtuSrM81h/+KGVshGbkNN5IN0AS0?= =?us-ascii?Q?LnKMJq5AtXECtLRLGVYz+3gdyda05pKT8yvLXLLc0G2sSrJDI9Hr+Vit9ROx?= =?us-ascii?Q?gVOIja+1Pr4DMZ3Wm9Jh5yu1+lef5R1fYNFK0TYIcJv/U1tFOJY4C+RkhupZ?= =?us-ascii?Q?4+srMbldy42OMS5mmePZdnrFoVDVV3hMY5hOTRFstXykGU2nohLRIpqQUVK5?= =?us-ascii?Q?NKSxCPghXdoYMRjmZsNCN6++FCT2pIjJo4LXch+IfD0xAcpaGXm/F94yPFNL?= =?us-ascii?Q?r+74VQ4XHrs4nG81wlFmqvNP+MhncoZ+3FLR3AXjCTZku5IFGROasTysb4/g?= =?us-ascii?Q?a3zj+58Tpzfx7l98P2nfYb8YpMu1tGHCqaOYayDCOuY6VMqmQsQ985LhCfV3?= =?us-ascii?Q?7WSDHo5sQBSZ6kGsW9v4wvtY0OQOIZgUQWDVTX3fggqSoDMw0Kh8UE17Inz7?= =?us-ascii?Q?eaFbZjWR4OTYSmLN2Ji0luexNZJHaPf8GUg389x/AYRVn32WV8snmCtJCc6e?= =?us-ascii?Q?JNT3LHeEtYrS89rbp8+AFWBB0OBFb6KDbyQo5aSEl02ToEC3AhuyRCSP0n7z?= =?us-ascii?Q?j9fhW4wGhxIUJfIDgGIN/3QPuGcz2O8vNNWHAqXYqHcUROQpN41qQvvR7kxk?= =?us-ascii?Q?WXB9kzIQ1NbARspnBcPZJSJgTCNwpNm+MwkaH4jftk0ok57PSSG1QsA1RVEd?= =?us-ascii?Q?hkW8lRiTSIJucmbm6CHY6VHKZS/mlORRFW0/9IPH7yJoFldyMQnx4KrfmkCO?= =?us-ascii?Q?pwXJHTvfNX8ARWcBZdaaewgJjU8GhFhSNW7Gn3j4/llDN9TY6WHo7T+uwkbV?= =?us-ascii?Q?XmHslvOohCsUAesdsOjfIWTMkQNjtp4UkmFf+dFJK8xi6ouUyP0iT0YHHVo3?= =?us-ascii?Q?UtcX/4v1/6D81aw3Lly30jDPOoWZjtn//V2Rk+VySlARyJ9fTJvOwi4wwURL?= =?us-ascii?Q?OxFm6GIAGjGdr1vd5+5lYS7HAXIxamf+l+bgbgRAAQk7y+vkdE306Q/H3AFR?= =?us-ascii?Q?2Diph/o9n3c961KK5rTS+c2o1P2CpBLnxT9CnJyJMa/pmeaOyYo00EU9O9Jw?= =?us-ascii?Q?yIzfmZd8NOrBzp7UrWcX87pBgQo4vUVLRpcqjguNWXhPYyDiOzACVJ19dBN1?= =?us-ascii?Q?AbWlZNstku9F7wgaR7g3taBveqyZtxrSMQba1Goh?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3d44ebef-b0f6-4c9c-3a52-08dbe4dc8e4c X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Nov 2023 06:40:13.9535 (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: fFHTynSE9pMeh2zNkQMUVw/UgbEUwGVLbJeQpIVeNUEWgdxAvE5+XO1+SeQqwbog9LN3wa11gQo81YqwJWJ7jA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB8932 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 15:08:21 2024 Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on2087.outbound.protection.outlook.com [40.107.22.87]) (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 9CF6D612D for ; Tue, 14 Nov 2023 06:40: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="tN37hGv+" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GSdXNJ4bWSi5sG7VkGuMZc9iws1ygq7GMxqWpU+oT7ylFCMMqqmhvEQgDgWkl9RHTJiUPvsUpl5yjusJweC6l6Rh/N7pt617G1lIIE6cfj36LW0z0J6ACw3++dGEQocldSmloB8IzeTxeAP6ZDvSdsoDKMv3qhLPKAzLBJraRaIYLNKbypPgC13fKAMUStnhZRGhMhC5glW1rn5kJF5XGwOwKuI7PnW7RP0646TCWp7rD3meiLay5KI387+nNPplTL0GxoGL+NHlcm5J/0Dz/G7bcXbDLjrBhZwIbzj1l3h0CNo/y9NEqFgk51fyTHwf6/HpjZh9v400jaS2uczFDg== 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=Ag+QUeb0NElZytJF6ZexyL0moCwhMQ1CzWe8Rz7rAafwcnQJS40JEbPmJDa6sZpHbST/WiRs0u058YoGe+GoTRYc+bx6ScBGGS7IRK1bRukET0NQNrYIzPq9B495ufEaqmGr+TpQapFH8EQzZ/2z3DmTyYiXFXmQc+ANeIVnZdWL5odI04OihqoyNwSpe1AkqmIZ9DAcPzp2oHB1pj43Cw40ual/ug0aJvqwXcMAT2/D6pgkEaGZ4vLYlIc5B/F1of/W9BOpqbQoUySz4J8tJlN4mpxxjXWpZvQXSX+OprSlc3J8uEEr80DdLuJNV1aXEsrqYeYOkCpKF3AJRxkHAw== 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=tN37hGv+rTgAs2L9NTVOGbc83XvDuaOCcAKgpwnR593urXT8VZM/WiIguAvzSJGugUsMORRfLm+igb27KKVPjTCh9HgXHh9oxfayiNElWx6tfjhYh40WYjkYIqysJs9DuuEOo9Gi+s1V8PqluDnaOUBCfjnE79tRYzLvCfTMvmNfuzZ8kFM5c0whF9rBGioK0DSEfKiLmhu4GeHruDoZhP74rCnfQYK9q4pj2J9lnEzECdVcr5EWjs37wbUSKhDZhwaJFgUYR9tD9xSfGG/g5QusvuYsPNgujRbJB8R80MTBjCW+4XF5P+7ekbC4N/fj/lG6ZQ8A+7Qg2CUXy0+udw== 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 AS8PR04MB8932.eurprd04.prod.outlook.com (2603:10a6:20b:42f::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 06:40:20 +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 06:40:20 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v2 19/32] selftests: mptcp: rename test_cnt to TEST_COUNT Date: Tue, 14 Nov 2023 14:35:38 +0800 Message-Id: <2883c2687349762a5180f08f3e0d2e0871aa4ed0.1699943337.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI2PR04CA0005.apcprd04.prod.outlook.com (2603:1096:4:197::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_|AS8PR04MB8932:EE_ X-MS-Office365-Filtering-Correlation-Id: d6c1a7cc-d117-405e-307e-08dbe4dc9233 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: BRPK15Eb7S0+G9CxdLV8gKAGYEoKGndpQfV4LpkunrRZOO8LW4BP/eoL84JR4ssdQFkhmk0pfS2dKDGR+wkTsw/SEBCtJXU1R7cCWJPH7F//o+u4oiPILVmm+WnvFPLzJ3UDA/6nUmDy/DgwOYV7lhhSgY0xbtgDenCiwIh2sU+UCSq6G0Ins9iyivHORsF9vkUNMZ+f7f9zZ7vRboZQnkQLRPFe2441wPG//E7yffDJ8A6O4pew3jgKuzxl6LbP3C7CDE+d3FqyUZjGWwqQTPf/4/zuIEHOmUuEAqXkQaNVaUR/7C3vs2qLInlCy9TxgBL7YMrcVWUSZcPLiyQknf4j+c5JidFicwKRxHY05ryL7TfYG2J16ONdUOaaN5S4OMtEJFmyZ+qfOSPPbWYIbG+2yJRNsyEHD7S5594cAh9b9GMjWvIPw9FSAeAIDlTrXHD8siBO4YsnN9lTrZA6W2Ef+LCvjNjzEaEde7iCVWcqjviBMtDEbZyyvb01QixHaANTwWBHcCNokLU6BvrlPckdNXCrpWCV1tlmmsDweDYJbuT5OTFPRY32/ZR2RojY 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)(346002)(136003)(396003)(376002)(366004)(230922051799003)(451199024)(1800799009)(64100799003)(186009)(107886003)(5660300002)(2616005)(26005)(6506007)(6512007)(44832011)(6666004)(83380400001)(2906002)(478600001)(41300700001)(6916009)(66946007)(36756003)(316002)(66476007)(66556008)(8936002)(4326008)(8676002)(6486002)(86362001)(38100700002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?8NAn/Gyw2OxiCzhxJUd1JLpiSv3C6m0tiCcmTHrO9XOjgxllPv1/L8/qch7v?= =?us-ascii?Q?Q8VtFOHjsy9msNHD0QB5VCFYpBgXnECYWtpEMDcSn6JNcRJFCVLSboCJ1km3?= =?us-ascii?Q?dTshkEfnGRM9XhLuw+jVUjKkTl48ZR4LXz8pWLJN9U6uAbYO29wBfDsPOXDk?= =?us-ascii?Q?DVPVjVid8SXDbbmIgW3SRvxjg2zhaVOV/NzW4UB4qWFvjnrWNMBnlWl4BDvB?= =?us-ascii?Q?7ZwxMP7BfURKmSIpE982OQdvtMrbHWDOoJD7At83gwKlJx7GtKWBBYwknvfH?= =?us-ascii?Q?MzHjdU2X01++lUSiCiGPh53naHJxZWrFlmQS7LBUGHVEVLGRxLjb9SANQZFQ?= =?us-ascii?Q?JlmK3zxhTDKLu84ouZO9nFgCeU2UNWbQdjsENN9zHVMwG7PkUf+aKdjTp8Ju?= =?us-ascii?Q?+rNpfILaD6p31zCrsaEd6cOwSyVr/6ewNlUqfPurMML6YPrVKwd28ssUeQT5?= =?us-ascii?Q?Ina4iA9x38lL9tJrH9Y+BFJeKvVGAKf8XqaKGA85vcI0ICS4uivIj82YclaT?= =?us-ascii?Q?lL3fVg4glfjMA1o0p+x5ZeQSULocHoqI9tC0v5qlP9lKfYC/7xl68RMnr10F?= =?us-ascii?Q?eVB2NxOLYZ+55ppD6N2n3rrFNK3V9nMi/V6qPqU2398LkUQJcLzrfxcuEg/5?= =?us-ascii?Q?eR7rTK0LhKmv6Od5L7uPKr3/FklH/+iag/BRAUrFj/iPsepxIlMha6PRrpOJ?= =?us-ascii?Q?Zyrp7HMPKPVnEWirnAuu39JBGSX5w84NEmV5GaTPWFq61Rs7xdrl9tV4gwnh?= =?us-ascii?Q?VJgiUeUJ+TMAs9ILNr0rauUsQ9wEvaK48nBgK8kb+4p8186TPBRou6iD+545?= =?us-ascii?Q?NFiyP0JAr1JRw2rtcWz+Ker1RDymnMcXvhieA1VLRhqrTQo0A9w045a1D8lD?= =?us-ascii?Q?TaQovPUQF74z/isB8OdRr3fA37GO2C8GbYoRcp6fWXZmXMa0NZevgkyda4ub?= =?us-ascii?Q?PMh4xZw5VSi74zf6WUee183x/NSR0dQFU5WI7Hj/1QqONuWmoQzjOt1AiDNi?= =?us-ascii?Q?EFsz4BoiKZlOEaK6eoZcqeAlzs+vE15STDR4mhdYgT30htkUKZU8xlABfcHY?= =?us-ascii?Q?uaX/afao1XBadHacPRxBdRmwiBnkHlc8GK5pA6Z58glBeauxX8DzaWlnWvQo?= =?us-ascii?Q?UkqJj7g1zf4h3G3e9a5IiIxhU2URkjcfeVCtqIx60sODRKAdbWbY4yif18gM?= =?us-ascii?Q?j1alIVDoPcVKS9P/SibIXpJ0Yoqxp31yP29Msn9jcHLhwQ2jCSYF2gd0K5Xg?= =?us-ascii?Q?6ONvEogAWLVqOYzvpG7GlxL/lHm2ql6zI/mpl/LGrUyO+D3Q7iQ9cy5+yh0V?= =?us-ascii?Q?vSYlPUeJH2muEp6objK9x9vVXWZFcogL/NOjAKP6iancT+Ajxf5Y9Pl1jgo2?= =?us-ascii?Q?gHy8UrvTVqHMtm+ZgO4+MY0RyI7B03gQ1onV153/cTFhUqL1qXuuDkRM4VRX?= =?us-ascii?Q?vEpcJVTOq4gOesgMuC/foAqJXZyAW2ElYXNtzejVOl1IdJ6itf6rMFQLGHYL?= =?us-ascii?Q?jEPbJ7TQhEHZcbcohM7vOMW7NvV4NgFGoWEbDN0O5Ao6yGC56rcH0zV3AQca?= =?us-ascii?Q?YKuZ5zoteDE3NDSeahJicqP7D/eRzDfBbsjHRY+k?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: d6c1a7cc-d117-405e-307e-08dbe4dc9233 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Nov 2023 06:40:20.0885 (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: oVkxHQAn3N6SKTcHUIUnc2Kj0q2NSHA2WWRgjFZhDG282VX3Bbz/AiY9ZAlD89VovPtjkbSDcYvWtLIcdEcMrQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB8932 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 15:08:21 2024 Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on2063.outbound.protection.outlook.com [40.107.22.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 9E6DE612A for ; Tue, 14 Nov 2023 06:40:28 +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="2wjuKVCE" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nO+BTfDqqGVyI2yqR2z2hBI9ywE/hvjgvA14ppn82CqV3Ac6ne3MgZH6IHMSyx5Oyc9RMJNDzonSEH9t1h9+ChATT9NXhCYwneUDIXb2oz+Lx0Lr8SwMsfoTCs2ohwVTE7Jhx9wAUQnmhlkfDBz8PwbqVXPo14EBEZ4rrFxyYNQhP4Ol/ym+UOfTEYdhgFF/OfHuxlrGaOjdBj7HDz6xHZROBq1BP1uq1wSt8laYdDtnCn/DdLPHUENCBmJc4+YhfOeXLZbcTW72sFqlljnutnH2m23UCo/JsI9jZMxreoj1N+knDuHC7+dGngSztvrM/nx6yM2WaQ6M+/SDloXsFw== 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=lpnuoR239+SYcJUJO9J1ue6ZzajW+rX5tMMZokQk+CTAnc6NDBVAn8jdFfr0wg4ZBh3uWQmqHNAGrRFvsFsqNmKczvXKpxdn4kSApq5WVUSEIhQW3T2UWOWYy2fHSpXYrBr7knVro6YbOokehyS3Z3rCFF3KbAsfoPAuBNCuFvqPO5HSbGcyVfOe+8L831Qzxxu27WAVKu04GBQvNsk2+2MMRVR3slykHG4TH1CN1uUVGvejxAYAUpvjjfl0wtWz1XaVh4jo3TyD9TI/+1rzGhn00NRtSkGjXKT3dJIo45DUYdfsu8VfNS0rblviqtl9Z3pPotFO8oU/2JCoef2aSw== 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=2wjuKVCEcU5GyLkZq/GqHFsbQDMEy3cbftfDVe9EfgEpPkPBr85Y0bhb1V+IepbO7vK+ABTskSksJALVXFuo7fDqZPi1ysoC4OUwlK5igRwVh5MQVa7CviezxiWEfmQFpNigjAOhUI7asDsovNANK884a/SvixrXvgE+MthOnc6mpNNkJl6j1zTZGvkDrYQfDVSXzzBazISOXALi0k2aR7jN1/avHsyu/EQ+6xpQnATypfUSAMH7zME628+7lzvxdporSS7+QtvUX8EEe9xjQxfy9NKW0zzv6mMHyI8um0ZhrhR7OvBZXriiRDq2G2wHRupBaAnVqDRJOI2Q86ugzQ== 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 AS8PR04MB8932.eurprd04.prod.outlook.com (2603:10a6:20b:42f::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 06:40: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 06:40:26 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v2 20/32] selftests: mptcp: diag: print out test counter Date: Tue, 14 Nov 2023 14:35:39 +0800 Message-Id: <4acda9bd89f8f3e2286f7d44bcd9a0cef8888a22.1699943337.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI2PR04CA0011.apcprd04.prod.outlook.com (2603:1096:4:197::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_|AS8PR04MB8932:EE_ X-MS-Office365-Filtering-Correlation-Id: 8b4c2dec-f3dd-4675-dbc1-08dbe4dc95cd X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: YHJcUpcy3i0bW+UyDNbrdh70QOrY+kpDwHcbUsgs96mzLNYTjJGvmNnh5TOYq3CsO+yV9oASReM3fpPP4sOpR2/PIvYioeh8lmQtIV77zLGBYWzpKRUmX8B011r5z5bqR/Jzwt+/er6ueuLQMNg/19CN0zvTZuoIklQzA2qEsEuWZ7991uXCYRQmxzWOa1n7NcIhZkI7Rngr3YB/rVGRqQNy0dlUcQ0pD0/Zor1iwiiFBmAvyrcx/pRzQViMt51QkDnZhUD/qqney1DUgVKpRJTEHPkjhw5iUbCnprvJNSfqITHmTbQCk5pzZb4y739UiNQkFQ1+F92tJzM1tUZJ7FupXO2gArVK0p37ztoz4Hh1QnEAd4/COKWz2eMp+DSgcOaOliUIh64jzcKfg9NUqVNDhGDylocmHG9gyLBY9x14fTYTJt3qV+qdGwpy+QHEHCDtzTW+6dvSaKxdNYGTGy2NpoZgMDDj08gZ9FS16Pw8Uxl1aydnbJF22D5Y54HH3U10eqlK03Hg0T4qfq6lgh4rdzy/7fNkq7997ob25HfLoiL3xDew2p6VMIo/P5c0 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)(346002)(136003)(396003)(376002)(366004)(230922051799003)(451199024)(1800799009)(64100799003)(186009)(107886003)(5660300002)(2616005)(26005)(6506007)(6512007)(44832011)(6666004)(83380400001)(2906002)(478600001)(41300700001)(6916009)(66946007)(36756003)(316002)(66476007)(66556008)(8936002)(4326008)(8676002)(6486002)(86362001)(38100700002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?Ju3vBgxwfFWMr0ioB0BX/HY9R9tyjhoRQKAojg0xHSOpxoa8zM1/cNTzb2NK?= =?us-ascii?Q?LEJ/+kcDHe+5wq1Guz0klXU6+js4/IAAKecD/nYQZ34HKiX6X9E9+IHwp5xq?= =?us-ascii?Q?GRhs8iHwxLmwZ49ZroOr5Z0nTloxMnvbBZ80Th5vycVyNINzk1uqxemk3sa2?= =?us-ascii?Q?STz6aRp4b7sTEusXguvLkSaFdy7xctXO68eyTV6+c9PD6jJc7XO0xbSlSy6r?= =?us-ascii?Q?Xqe8aIYwAVudLExMYdnKAQy86Mrm5RsGnxeFbGb/R2IvgfCZxVUN+96PnSP/?= =?us-ascii?Q?JV3Loi5FydOkKVTzy+3zPIgrYRX0TYm5kKlHO5gCj0VA2W6oonhxwt1wvDsZ?= =?us-ascii?Q?MVuaJsNYzm093iFkFnvNQhXd/EyGPq1v8rV/4E/QRsdLUi3knGNNmeOpBG+k?= =?us-ascii?Q?RkZF8Qc8X6YT62/eSbDmapTu+tjveKTZcX/vwvtkSDorWa4/hh+VjgEbZ1ju?= =?us-ascii?Q?Kh5ODwWN6vqSDx+SVrZ7cSPDNmqXxz27TBwUTcaXCkx3UiGPick3uOYSE+PP?= =?us-ascii?Q?vqk8BLjlpH3Dr45hJN2HsUMoOj4OrPtigTaLZ0AomD1/OZzu+1c+4Tio9tV2?= =?us-ascii?Q?A+x0nq8IqGSlHE6czrMH9jNpUSXKvX8tY5yIuOyOsQcC5r0vi+5F51kYrnio?= =?us-ascii?Q?AuHxbuLE9XgQl41/AoXAOWGfbgCc3BnpAmmZvD3CEvm9nvtc9qXMAC3GKPlx?= =?us-ascii?Q?ILdpS5R1ZZQYuHck+ZDXz4AyvHOKdXLBl60t9WBQeG3+jsNKOMPQiLO2tleQ?= =?us-ascii?Q?3rOMDhpwD1D6aOFAjdaXexUloOxGB9TbDwTR3ZJbInvMBtgWdRj/mCizqEQV?= =?us-ascii?Q?1gi+xG8MrN/Qza+0OZaVfwkXvo2SGZQo/ZjfDapTCfh/kmF7clRQwGK0++df?= =?us-ascii?Q?zza95Fn61q3CUHXJ5BCdbpQy114ZfYbdAENcXkWknuyCXFIaMAAO7Y2+6clm?= =?us-ascii?Q?KZoJj3LzYoWGQodlXbwVVys/FZBrqXNWdWPeeT5kzOxXrnLCEtc6GfFAO6O4?= =?us-ascii?Q?LwhytliS77t6eHQ+gjdaWyZwK+plQliMIxwDZmQBsWC0uFFNSpR4vkkVa/QI?= =?us-ascii?Q?9cB2lWa4iP8tvF4yyASqRktuPKJks5hcB8KjbHhOyQ5FJMXTi6wQVUKLaf6M?= =?us-ascii?Q?blkNY+ornn2w4A+1Jg2YSRc6TFGjH6Lh8gOAX/0Q4VfHtYdQHA4wIlhZtrCw?= =?us-ascii?Q?ZuQJoTfiRjJoWrR758slqMRi8x2fp48t4zTlIwD/kNzJbpUjcQvO7MmNVG1j?= =?us-ascii?Q?8h1c5+uBXcKrcquMxuife7lQifHzEv9E6MO0c5Jdo0Zmre5FxKr6lrkUcdu2?= =?us-ascii?Q?bT1PiK43waNokgH6p1BTN+33pTh2yM7T/aSW8AWbkiSB5bfI/TEIsyT1tXsD?= =?us-ascii?Q?HH4iLtt7niSXJfdO7Lvkit/PhqgUTYB4xHc0kuym29afE3yL37eZtaqIab5d?= =?us-ascii?Q?a6qJ8V1W2Hn9Y9ZQXHs1JGGkMy2yVdR5AoZesJSRbjUsTK7GdKrob5z1oKws?= =?us-ascii?Q?Npi6USQbv4q/Zs+T3qOvD6k9MnkDL0hwiSwqkXovLFit4LVFuo5oTxos8Ctv?= =?us-ascii?Q?wx7LRvdEJjctrAmd1Qm9lIBj7wbMQboR5Ix9AAmC?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8b4c2dec-f3dd-4675-dbc1-08dbe4dc95cd X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Nov 2023 06:40:26.1424 (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: D8xiZUfCVWLVeXiDypc9/qQ4gISjsZ4yJRQ2w7mjKRNh7pquWoDr3A91GVgxg47wx3tzIA2+0/8Cs5IMHWTYeQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB8932 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 15:08:21 2024 Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on2076.outbound.protection.outlook.com [40.107.22.76]) (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 86BE7612A for ; Tue, 14 Nov 2023 06:40:36 +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="CTDeJfii" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=SYdzSkeD1o49Xzrxf0NIzpU+lMEn3cr+xRNM0T+gnP0pOmnNOs34u0FPyDazDAh6br6UT91s0of9a/i9kbgQGQy/oAtxMoWTASurJN8Lf0BXd+67bNYAQz5nHwgIW1/VrQlqwR8hDDNMow8YaElW/1HLc+RngyzYnDpi4BfQog7VvOny/vr7LomfjOfNFtLxyVuPtWcXMhHfO7m3waIuFcSbBuldwyvhLWjJ4pZ1Eu/GJ/i7jTGc4r/KvI9n8VlMSm+Pj9IeiLUek8WbK0ZJIvDsXfuCNXXZkCsDA8zW3JE+VC+Z/DB/xtNC74Fz+nx6p6m2OWwwi39itdg12kNO4g== 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=ZrHa3wEXJnnXrSR/nYSHHV2igKCLZGkjlyyt6BtBqNIan6FV05rmNG5KapRBzXSu8RN+DG/FWD3azZlksBfXqEWs9Pw7ndp2X0LURgOOyNRPcR7JMdjtXmZFLw8AMDwIj9P5Sfj2zrqPuvSe3Lw9ghLlHquvjnY2Egn4WPF6ZXslO6B8XgyUCIX9f++2PVkBb4Bv2TLT8Suc80xJ+hZtJlbmAksU3rKAU7oTfK4sj+NLQ4g2c6vLxjWJ1KQsOAzeb60Yof4qyXccAB/CnLD+wYDtpcaOzfPshRyq5CWhOvCkVdz/ZyGmv/w965Vomft2BTv6K8y1sTZwE4d7Q/NSIQ== 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=CTDeJfiiH/yqJ3dly4vH+rv3VroSyNgsOaWSQK/t7kiW2BXTLepvPyjD/dTiCXYtacYVuT63bSexwo9nkKa82nh08wezeoZ/dF2urP0K+vz9U6blDXX+H86fXhoDykQhxNSFGSryI1P2bt7GRy1vh/NCu4ygghXT4mOzhRFRBN8eSbW4v210MLucUZCZ6qc8ZxVb7MUbBTRk2sjuBqEMKdHwAzCtmzyCXRXBnMelCJjtuPmW7zWYwAP/eyrbCF3rlhFtKxMP+mc0FFKuR89yourHAEgzR9ejQFrQZ00eYUyhx6bGvA3GLkbJ1d8gjuMl/1tawrVXyuJaunkj2PFE8A== 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 AS8PR04MB8932.eurprd04.prod.outlook.com (2603:10a6:20b:42f::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 06:40:34 +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 06:40:34 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v2 21/32] selftests: mptcp: simult_flows: print out test counter Date: Tue, 14 Nov 2023 14:35:40 +0800 Message-Id: X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TYCP286CA0058.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:2b5::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_|AS8PR04MB8932:EE_ X-MS-Office365-Filtering-Correlation-Id: 767091e6-c5be-45de-8bef-08dbe4dc9a92 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: BXQ/u4lpEAyvwhv8jm+wsqSadjFNFfj05K1sGDNNN1EsBdIwwsNx9ZpdFdRGFD4186GJ7zU13oQGdZcufGdprO3tGq0tRK0iaE2RuA6gZQGkS8O0VWa5CpuR4IO9RAAVR68Ln5xIOUUIEoNCWZ9s6wvPcy8jqtxhM5izTfkpTSPh914dRNE7MeGfDObognWtKf+8LTcJu2agN6EAXAGNatn0k2OtUwy2ghqY+K49VoA1ZdzUrEkIQaxbhB8ox3v7Alaw2E5pHg1iCkjl4HEkF+LniKj6nmK8DLpuBRWMguuo3yZdMq8qwyYappPo32OgX3ejhBqbHUNAE5QcgK5JcSga97WSnyNQWcnqYHEFm+KwzZn3lQwcsEQVvLc/E2rmCJ2sGmkrcPQaiXjkWiabr0ge4lz9sG7z0I2ztkURy8kboHwgnfeYpMAP5fNibSCcIpWbfohIO5xf3DRZWL7zEuR7iPI5YoVLPIS58O6aT1FwBebWCzyNoen9UsoijytS/JTuMh8S4Z8Qbpa+aBRq8LOJzPPQ7aWQ/m//KJmvvFwfqc6R9jqp6sWTxnHwY5iW 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)(346002)(136003)(396003)(376002)(366004)(230922051799003)(451199024)(1800799009)(64100799003)(186009)(107886003)(5660300002)(2616005)(26005)(6506007)(6512007)(44832011)(6666004)(83380400001)(2906002)(478600001)(41300700001)(6916009)(66946007)(36756003)(316002)(66476007)(66556008)(8936002)(4326008)(8676002)(6486002)(86362001)(38100700002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?tekQhjRIE0RC1QtQcKsUBqn5A/465tgaEHxccMrWzg56gzIUjQJ+ECOJ1Gc7?= =?us-ascii?Q?bJVb9gik9QGCyph2AJ5z3ApHT1tsyVO7CK9PrG3VSd2Bttwcllxln58sTdLS?= =?us-ascii?Q?NE0jwmERviGPymbdqIYx+XYaUMYcnuRWzWgfrbLqsUqKR6+Mxj173WEHJrJu?= =?us-ascii?Q?HrBPStGhPOulcrQ1DoCqJbOaKF/fSiMO4XWPRBhcuorTkUCHti0c2QtXmUzy?= =?us-ascii?Q?KL92CRTf4A9ktEH/btf5cfH9UKuV9iujz4AcKkxDlpi9Z2spX9xATXDIeCe7?= =?us-ascii?Q?5qoS92kvstulm20x3yzvFXkL2EGIGnFrGwYjBCVIvmUSXQ/OgO87vi5Xh8ML?= =?us-ascii?Q?64FY4q2FAh85HqdkY6Po2F9aXCr+tZGVhCWTWMwqPvyAlyI5jET3uamP8NVt?= =?us-ascii?Q?iQj/QfmYx03bo0xdmeo3HfaUpeKOToYUHy9Xk5R4n4FNbIC8/x2zADfJOE0G?= =?us-ascii?Q?5a4RhuRVY2/cc3St1wq0f2eiC1L3mk/O2nYzduUSE9iW+MFBU0n7LCQXT7ql?= =?us-ascii?Q?0P86e3HwqKs0Bc9Tp/AueBX2XGrhda0fzypVebtRxrfv3mtQshJheJbNQO72?= =?us-ascii?Q?8+zqUwbsSpiXgdrLSoscGAtccSwdSj9MxF6kFliCuHYYGZxdsirJZUWbFgOG?= =?us-ascii?Q?fL7dP9XDY167xORXjOUpdGWdqpS03ipPybcSnX+DfnthAtntJtWMx+y6HwFf?= =?us-ascii?Q?6idl4YOV0DeMevUMr6DesK82eswQyjJxU2QqY1a5gX+KRst4C2rQAeH20CBe?= =?us-ascii?Q?2ZaoKd5yId+IvkoAnRRps4k8auf8Uok8Cqv2FnoYxqRxt7ElCDus2XU2/G0j?= =?us-ascii?Q?lYkk+P6xTu+iTUZTYf3g4ZQO2pseL5+VR4bmgQphe0el9nDz+H8i+RZ1M0Cy?= =?us-ascii?Q?7PUW5s5GXmC6CagSiws/7g1cg03EtXGKZEg3etr4yGZyWu1QedC22fJnHsdz?= =?us-ascii?Q?uAZFAsSxIzNdxiDX59WdVykA0D+mJux6+pmnVppQ2rw23u+glJD2T1q38QY/?= =?us-ascii?Q?HRPV2OcjUrpGxPw/F+yBkzGwQSV9ijztEqrDIt1cQIm6PtTUVQlOrKHdwHDx?= =?us-ascii?Q?TtPLgS3XtF55sZofBrs/wRy776Q+WXkg/MzGLv5SQAWDcs97k4sf917V+M3d?= =?us-ascii?Q?AV1ECNzeyQTysKxqaphQtAoFYsJumyBU+Q2esgbF7jpIc0fKvEcIgsVgDxOm?= =?us-ascii?Q?n/fmsh6dTGyd5eCVWnQJIlDee+RK6k7wYn1gYvb9qyCjVRc7RIub9+cX0BZN?= =?us-ascii?Q?yMlAlAKf+bPq9t5CNmlTuNp7ZBUiAGcHeVy/7drGwUdLcNhIS4Htkh1RpyEy?= =?us-ascii?Q?iQnRsZfTzDn69eR74duA6UqNAMdjNSUAIe3rkWWdKhxxl8m+HMhLllim7Ytx?= =?us-ascii?Q?afszWLRw3Ax6H8nzUe580UF3PjQLrwdkRYwq8W8GfyJ0MP4SQhWwFSUMpzCO?= =?us-ascii?Q?zJqFNABNkYQac9NeD41RHgrl2wxxmhsfeq1m6DJA7kM7giGW71JZzGfiWHOQ?= =?us-ascii?Q?zOeqwvkORDN/fp+1XRbwE7hh6RBc0B0pIHI6rQh9RUAsD80jsJSm4B4seQ9x?= =?us-ascii?Q?3FPC6csRDCMHtgk/zbmSNTJm5e5Nk4HY6bxmxbH7?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 767091e6-c5be-45de-8bef-08dbe4dc9a92 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Nov 2023 06:40:34.1285 (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: fwRRA0U7NsXs0gEqq+a2/k7YxcKTyshCEkjlJZSka2KRq3IbY3qwN3PJdOcQC7qGuw33Z2BVgswHQGNXlCR4Yw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB8932 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 15:08:21 2024 Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-db3eur04on2087.outbound.protection.outlook.com [40.107.6.87]) (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 D6512612D for ; Tue, 14 Nov 2023 06:40:44 +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="xoQB7dTr" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=VMthuBynYIFUUQcRhqEjF8TY9lcYjsI/zS1K2rRSuBX12KOG7RZsH7ELlAVJUN4mt5kcdFm/B4GyERv/+Zsu+L8r3znH+ZUsa+/gSGED60aCmwfeYDsyutIwQ7cK0XNTpp6qSsECK1SYxi8LsU/bWdvFDqkxB/8otLf3Zwi5WrXRjqNAFQBlAvoiGXS3dcdYAwmY7kO/wDLNar1p869JiUUk3K9VPqUE/arhZQ/uE/D9qOdo3NU8Ar1876cZbPvpRlL2nvR5Umlfb19lKo+2jBCzxsUosmAQKBdtXuK9vPG+WbMYyHii1cwpYtQ0eaHJWS2yvHed4v7SV6PsJM8jbA== 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=Of+RBJ5I0VFb+GUT4VnXGndsGeaZrdRKEJh9dDnN0SnH8IlAWo52fJHRA7f7UIVoRpoT8fOtu0hExo5sY6hLVJYPlsy/MrQK8beAj6iBAWzesNkgeuuFBcwJ8sPIgGQgeAXxs13xD2UohPRqt1PBcNUPWk6xf8SIxzaTiOeVWt7kuXETNzFDP0F0cqFmnTiqdYsw7d8Jwa9QRJbgGo2wbgrYS0eGJwdvkISS02F537KaHRDQlI1h73gQj4Q0CVig2Dj1NfeYurR3BS8vj6r+KKpvP8WDGCggEv5uzk7tKqHQrdt0wWCoDGlNT319xQ/PlVIog+UgznEAapKKxtRobQ== 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=xoQB7dTrVUa5QXKes0fiC0G4vAb/fftJG5Df7g/ghhvcxRQ2X4Sl9mF0TIZJl8AitAgQXN4cqTVrAMXlCS3nS05O/K2kwXnPL638d1189zF2cIQgnLUU5V8jHB7mHjyqlM6febUHF0VoKkvBgVjpWk2IfSyfXpzyv3Xpdy1/WRBLx63Xfbcz15zIYMlQ1ML0un7GWr9scTKHUUISe0epqQugHqVrYfSlNOcKpO7CV7gkEGWCkkzUWtGe2sqW1izx3KfKlO7iIDBK3C2p+FJOUYzp0eawxaqgVnFF4XrO9sRyMgRj84dmLXWMIUeV09h+TBGAGGqUhnexIK2Kjz5y3g== 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 AS8PR04MB8932.eurprd04.prod.outlook.com (2603:10a6:20b:42f::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 06:40:42 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::7102:259:f268:5321]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::7102:259:f268:5321%7]) with mapi id 15.20.7002.014; Tue, 14 Nov 2023 06:40:42 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v2 22/32] selftests: mptcp: sockopt: print out test counter Date: Tue, 14 Nov 2023 14:35:41 +0800 Message-Id: X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TYCP286CA0048.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:2b5::11) 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_|AS8PR04MB8932:EE_ X-MS-Office365-Filtering-Correlation-Id: 7a83927e-3efa-4a17-3f70-08dbe4dc9f19 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: kKaIAUbzO/mzMkihv/fdGFaTeWehNAfUXzeflvhNpUgbahkywGe38zNlnd4DgEoSD+Np+8mjaeCkmVqCllPwQBJOY4vY7JTydZrLiISazjlVyd8J/coTAK6+sKRN6dY4nY9A4DAW4kBXgk0ig9FguQ13JXNH+zxoxFQuzkM01MTTdt6V9606n94mLzNaaCr89iYULTng2VuxpfBqYSE7r1dfCFg3cGjxiwIT/1YxSaLmT71yg+Vl4Q8p1VWml+2KUu5MhXD7BuHeZM86w8HsfKke+53fYJbmNGIt/TmLemmoou0dRxImuthx8YAET3Fz0tmYNPj1ytdqDDcqzhhM7Dm7ADQq4MNhBwGc0dw+IY7mD6rE0l08QCft3XOY3dVnK1+BFRgRBtmnUwG95Ov+zi5mfgEbZsgDIBqS6TLVH0hC52YCHdtBMpZ8vbeK81WfjAImaeDZf+ijmFRSYcsdUDQbq58DQ1lZa5NbnglNfbNrQrX16L8GYAsIutwGGcu5+slCpVAjIghssKkdKPnesXZvIy0DvBM1d0+I9t23gJfTud81PCFkULSY3sBZG0Jx 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)(346002)(136003)(396003)(376002)(366004)(230922051799003)(451199024)(1800799009)(64100799003)(186009)(107886003)(5660300002)(2616005)(26005)(6506007)(6512007)(44832011)(83380400001)(2906002)(478600001)(41300700001)(6916009)(66946007)(36756003)(316002)(66476007)(66556008)(8936002)(4326008)(8676002)(6486002)(86362001)(38100700002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?BXGWIlJOUk9YJ+iDUuAP3+AI/Uwyjq3AV+6FzOJUcp3OdhGht4izEUVP9NQc?= =?us-ascii?Q?10ZW0R+MYi6B4KJlz739j2RKA185nSVtPLO+/d4PX/c9xQnihtebWNe4f0sm?= =?us-ascii?Q?XIovRaIYS2sUp1v9RTC9Tu2KksDc9yRz1e6BazXmpQbp8qdogB1qV4kEBPwo?= =?us-ascii?Q?Mm2BP3ok4CFsoF4IW3drJqyLBQFVh6YJHe576B5oNpWyGuJ/voQ6uIBcAVgN?= =?us-ascii?Q?hE7CVv0UGufI1uaBujZU0invwvFr/y8zV87rceGh0JsJ8WyFnDxfVik8/QdJ?= =?us-ascii?Q?S5UB4JpCZAvOolbltUHFgj4NiVuyXDMMhAKGUrNr7Mp2Uj0bDnfsqoqYDwOb?= =?us-ascii?Q?ZOB3tvN/dps7J+VwJP7B9YWSzYBCOZDaT5KWGkgChvlkkmHYPhTJ6HqixxD+?= =?us-ascii?Q?pFqXcj0qxy54nwW195CFYwWAEEdT9WOlqDEwwcPDSdQ+EMZ78nKuraPsGD7E?= =?us-ascii?Q?hfsh6iShBXJp3inqLwo0UodiJHhzUuU9wk4O0YlYgc53krGUOIbg7RjRuDv0?= =?us-ascii?Q?jrHBZxxS0WTlpoT+OJYUxibapqdS0FpM6H/zAB//v9cumfMXzHPcZjSjNRvN?= =?us-ascii?Q?bxhyo//rOnNsz2CVlzBWVz9stQKS1bh9qu8eaD9/d/gYEob49wUTy1t/vNbo?= =?us-ascii?Q?ZMEjxiGKHnd+bxkRpPsNS8hTzfxmdEniKtWvVpxcQNOl8LsRiaUs6UAyeMtQ?= =?us-ascii?Q?MFJqdlfNy/rgrTkNf2YVlZtMU7RIx1T/PUEcUsRQYcm7jvuEtk2w5iNiyP1E?= =?us-ascii?Q?+tFfHNl8dYNnoCf9Ooqvz/h38w50xQk0LakDPZ5nRE5Kl16hKob032gSzfjX?= =?us-ascii?Q?nYIQqAx6mrBfDJDB2nX4TFY79HhFCGP1SFCY3Z/0UyN6yHxb/8N54tnoaBtm?= =?us-ascii?Q?xOk9AL42TDUQJwqpQLrQbo37OzS3/qRhl2tzn4TuARPPNSZiCYEep/t7D4l4?= =?us-ascii?Q?T3YvQqQR1rBzcFBfZQRUEFyz9NSNysM68Z6/nBZTmg/ynxiuySG5wUj0SHOe?= =?us-ascii?Q?i/AcBhSLdiTo5rIeMHoZH9cXVElVYz0LCnPKIlxkx0nl4oXu+C7e0RccOsEJ?= =?us-ascii?Q?LXglf5eA0KDk8u61MF1HS1hQip9WwluJcH0kGUTw5rhIXAcr/Eh1xhVOEmKo?= =?us-ascii?Q?ptv4v3TdS8IgP0hxUEmrqhqazipC4Zo6Fzhw2ZTdylsYtHakHXTjNiSU5lcE?= =?us-ascii?Q?izetpM3lnZu/pAjOSs5p09L1mSDs4wBXBaojTV7j7+4TKleA1rARnGEFVmvM?= =?us-ascii?Q?BUDiXEm9Qbk5FdVSSvNp4e6H8UkTJHoDZufkd0TNRJPQVYJX3q7rvGbwJT0d?= =?us-ascii?Q?frdbR5t7o8ja4n6dgj5Kp7wG0OvS03lrN6KvrqrQYfz/TR1Oz5Yx3FlTVzfv?= =?us-ascii?Q?6a9lQx4sh12CNgP9XcKlFqArHYZte9r9W8uSgOZG+dpKGFHS6pDKIsHirE7F?= =?us-ascii?Q?VFkmKZGXfPhtM74melfXMeThvqtIVLc+OOYn52dQU3yUoA0rQdKZGmdPxA1E?= =?us-ascii?Q?RL+KTyb2QmFUlrF+tf39GHW1QnNud3DH50qAq7/XCU7Ge7jW1t5zuO5AaCBm?= =?us-ascii?Q?M2ow2IR9QXTiabLEw9CjYQyOmZEA4OiVn2QN4iW0?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7a83927e-3efa-4a17-3f70-08dbe4dc9f19 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Nov 2023 06:40:41.9683 (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: RUOhKChwrcAyxGkGkTZj+qi9ZfNF0Tr4Juegz6zY4CjljkThJg2noASFSV//xuEguzTDVNOg2epz9vaSsJPAfg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB8932 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 15:08:21 2024 Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on2065.outbound.protection.outlook.com [40.107.22.65]) (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 4DA0E612A for ; Tue, 14 Nov 2023 06:40:51 +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="26vrFSrz" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Ob/Y8v8tpdEUAoa5Wy6M1HBqoK/L6TgbDecpJIRWVJmwZuXzM8alD3at+/NbMfz5vnKcnG3C2Zmvi5oHSnuo1k0OLPh16ESkQ+u+eZ8HnOUiRZf9Brk9/fundWghaRj02aChzZhtxCYonS75VfQwUdxnssw8zJSHC9nXQ8bOhjsusrEptgX6RYz7Fe3nuX1Zm9wP1yl7JuRCz2OUiNSJXDf7yjwdvTFht1S4Yx1tbWRxy9OnlSIrrnV4UG7dfG9Q4JeTti919cX2MHr1ZDcPVK4dWIYVug2TjsmI77Zt4wCxOPerPjFtgmitU/8I0RgprdbesNvT8n5qxgoqGVG50Q== 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=IzQKKpejcRwMsA34ihEsjLpDne7BWzYZ104h1ZJjTqrQpxQJN5Zf63Pk+LhlYJSizZvuH6vwUVE0aYFo6+xbzW6Szn7T6oS0KrSfIqHlnIvF+kpccbFlrmmY1lJ1KUl+u7tJTZXenxh4G0ifG3vXlMnENFowKqk94Fr0lx5gSlwETLY+AKVoHHgLHihiysFgY6bOGSe3V2rn2IAwkJTPuL1/BivgZCXnP2T2Y9W4VX1cA8+mJ2v1efU/S5rSBiNalwsVyM45k0UPhGCvqpCWrqeXlHb/x9+I1Jlahc98UXBUlOmSK64Bqi2AxvBQGpzPVkihYVBbwy5ywReN0zJBeg== 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=26vrFSrzKHlX84ucrMGRhM6Bq0COwEvFXucammE5/dJ02B/wdomwkDwQGhVGrov0iLJNIK6uQfbpd+vhCBthZFxZYeoIC4CIrv/+PX6r3XE+PMrKBphewnrzhe//hKGswZDefpJJiwV1ljfKWL+UpTqDEhPwI1S03hqIUJXSQoD65+pplmF2lVpPHmHYh/apKlpG8cjdI1T1POhFs0vMPzihJVY2GPynF8CSvES4gxdKaLqKn0Vjp5p3stu5zYDxXlxEhRPj3V8W7W9GyH7OntBiqycbnKxdYopPBgDAPjJjIPtKgABCXOWlX9qQ5FRe6HSjeuzh9L6k/SrB0jEBUQ== 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 AS8PR04MB8932.eurprd04.prod.outlook.com (2603:10a6:20b:42f::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 06:40:49 +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 06:40:49 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v2 23/32] selftests: mptcp: netlink: print out test counter Date: Tue, 14 Nov 2023 14:35:42 +0800 Message-Id: <35afa66e1298c8910c5de48c9cffa811f0275883.1699943337.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TYCP286CA0251.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:456::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_|AS8PR04MB8932:EE_ X-MS-Office365-Filtering-Correlation-Id: 8dcc254c-0a4c-41d6-2fb5-08dbe4dca37c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: wScCKtDjrKwqn7A8rlzEetoSEQhg9E17Ln1KhqtSkiOnvu7QHcVdNMDTF4hVecKGQDAdLD7Rzm2zug21mwA0RGDSFjz7dnKuUQWsE018tF+UetQB40J0sYOBJsxuBYknsITtVL3d5xjIOZULDUt2P9otvHkNEoXhgvtN/Vc6FI5FksICVby/iTppi+4c+WgrB6HQbQdmdf3ZlLOywTKhZj20hh8Rizer2ajpmxxH/vlI/IHbntbBZ4+ZZ2tWpbeTHn2rEIZ0y1CDT/TmnMpJaFb/OP3fjFMvaVzfWKLTtrd6gQhPrhItaL9a1563MZQyO8N9waLEDHGjdZvhiqDgV8Jmo6rwQhqQ75KzHD3jfNl58EhGIPfBt6ZcOQWY/SulxNtHQ+9kOwRbML87uqI29wk7NKGvU8aeP/coqV7yeDQrgbWaRv+6Cu0/B9KiYBG6jAjcA7LLknlG1sWRJlE6KuYAIGTEl15Xg3ypjqqP+COpwljDjba5LxXaLMik6ySOTrJSgns+iclulVe5lwTYa/KTEQMj/gJwbmVa3JNbwMKr5FDxalfWk0EXbusB2spS 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)(346002)(136003)(396003)(376002)(366004)(230922051799003)(451199024)(1800799009)(64100799003)(186009)(107886003)(5660300002)(2616005)(26005)(6506007)(6512007)(44832011)(6666004)(83380400001)(2906002)(478600001)(41300700001)(6916009)(66946007)(36756003)(316002)(66476007)(66556008)(8936002)(4326008)(8676002)(6486002)(86362001)(38100700002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?U3AdGCnAM7LbGZux6LBDkPo6cdxZPJ4F2+Kg2yFfx/r2KVIIAaM/QrC7NAqo?= =?us-ascii?Q?TPyXCMayEDVrGGG+6GukByk7+ihLt7XcpH1R0d3JtS6biCTeUJb2lW3v53ox?= =?us-ascii?Q?AFqyy5Gyp//yZqIo4a6TsH3+dne56ghgT/Be4NdUsXTgOSxxbRCtLwiOtgKC?= =?us-ascii?Q?AgTohCJQg461/cOQHNFLM1yuGXbAc01PfGkFTFXNginQa/xCOXgFu+8aoZzz?= =?us-ascii?Q?ETpD1aozrxbFVLRUdQIcPPqmxN/u6HEJyRiSzsvLHVE/i+WtzeifWp98a6Le?= =?us-ascii?Q?PwlZIx1KCJl6Md8Em9b3CxWeNf2nZaWw0asoTzIEIoSKOpbduxokZB8/nlqm?= =?us-ascii?Q?VlUoCi2hM4gT96AI1fxSAngLFbli9BVK09MTNFK7j9CInFMPIT43kOOmLpEK?= =?us-ascii?Q?U5RGHVYibTlU9ygB8AEhBdD3A7pCaovYn49pnmXByLO5w8ENKoFWcKYBYBlA?= =?us-ascii?Q?miCQt9jhYJE6Td2TIjvChV6+ccW4WKpEEV2DbFUZEX05PrxW1Kqt+Q4CuY7f?= =?us-ascii?Q?2/EG+YX0biOFCxRYfIgXoadtyg1RbYGAi6KK68OvCwsFjssNitJFspbn6ItA?= =?us-ascii?Q?xPEJbM0Wza7nv9Y7Fji2IlTEKUkLzhRjAjFTptNm687xauBPGlXSTplrJMq8?= =?us-ascii?Q?CsGVPASlFfTRjsSO2Id4k6EnA+fjuDxhLZjNkAEBpG3N9cW1pz/LtugV1U/w?= =?us-ascii?Q?sI9Kdx9KnelqSV59HsMZVjHUjfp9qm0kes0jlBC/sM7QuxAaeksO3CQlcUcO?= =?us-ascii?Q?u/ke36HN5kLvLcd6/oKIAYG/0kFKij2lMEqWVk7QEqhXyTY47IEDxxmZkiBX?= =?us-ascii?Q?VxZ8GK3qy4LNMBslWZeZEC3BaGvJ+J/XAvmXOvikoZMssS7Q3WwVDcjtYD4t?= =?us-ascii?Q?3y5PfCu41iSkEOhXKcCFjVSALjKHDqZ1JS229jGUjPOYCmwqDLiqmpNnJvdG?= =?us-ascii?Q?ZA2LRABviS47jfeqIXqPPKIpjkIdY/z5FDtLF62rE2UIJnpyDlxlLUYR9psy?= =?us-ascii?Q?Cv+Q7r74u5miZYLyVyUMTRENtn590uTensrWhLoRG9GSY6x5pKOpEDA0PvAx?= =?us-ascii?Q?oLNE8M1cTKj2583ULsiZmi99ns15vHuCv4J5A/aHdu/T+KM+EecyOswWtaI0?= =?us-ascii?Q?GT8LHWKA047D9j0ZWxcJ4jTNNVUOT2ow+/qPcc6lay1StnXTQyYdZOkv2zci?= =?us-ascii?Q?R/70nQ5603EivORv6RZ5xejLp5JCiZREWlWWREUo7v7RmIAu69paPXsv9+eP?= =?us-ascii?Q?tyfHoRBK0hH4ylYm++POgNFCmeLjTL9LdxRn91eWlXOj6I0LcAwIUv64+sQc?= =?us-ascii?Q?gsH7RhtvUlQvcqC/7IQPMBwOL8jLJ/nhciq5cAex61WzArBPXXi8wH6jw7+G?= =?us-ascii?Q?l6T2sxG8xt6ghnbYaTHiNtOzArWCHsvZzZGYkwm0P46lrBX4cMU8Edkwa1rs?= =?us-ascii?Q?oE+03QRttWtuM1Ix2JFk6smmEadC9t/d4rjVDbnyJU9Yc8vtpnr97XAanKV7?= =?us-ascii?Q?viN9g32FFV9asVVJG3xcHxtKlQNKdwHct6Pcb4YqkvDP2+bSfpI2m2VHdjf7?= =?us-ascii?Q?Q+zt3TXRNRb6XiW5xR3xEC9xJY5Iy+Jdo7QsfOFw?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8dcc254c-0a4c-41d6-2fb5-08dbe4dca37c X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Nov 2023 06:40:49.1133 (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: q4fPMq6P7wOILb7+6sMFEHyiMHFy2eo5zwokGzptRR5MENAqzy+ea3KyLsY03wKdsAF1AEbKXxy5Qms2DAKo7g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB8932 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 15:08:21 2024 Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on2058.outbound.protection.outlook.com [40.107.22.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 1D871612A for ; Tue, 14 Nov 2023 06:40:58 +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="rf1aAw/r" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=IQ4VvRXcOVpLuy2v8cDkV6RYR6MqRkaT2qItKoS5R8uJcBgfT1YPxgBsulaAMHZJ1KIhPxp9hWik7JpC1mrwkpIAIXav5+bSDbYFWP33Od4p65Hnjz6pQOukDbRjcn1Ph949chNmkb6AdUXFoNbBova+N7JlfRNzp4Kx3rRc3N74Ds00sulQR5wDT/U5mugTN42SN6RiERzb8IED8dgg6JUp2aNWcUKah8kaUT0Artj4NSZuoVNOqwzwWnX6Jg82bCbyQHuzNR4qmEoPNKcODx0eL7O3sCyLYBUhRcgQ/SPJMTreBWWWzpbR+cPWY2EFQcStzoQym1obUVaoUgGrrg== 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=oMWyzIRgTveyLoMGLF3s1j6KGJf1VZabkqUcSTUPQ5c=; b=dgkjlJQzXb+bGkNdXvogL+MGPEiNhnH3OCVVZkR3xwoqaGhDb7ImCwflSt+T+JNQUTyP+b2yei4Bm2cpzBBJPsTfa8MZNF3vE0goPOlC0p1Qj/VhjGZrUkyYwmEQyOSUectXm1gcGdA93kz2Ui+Izr+gnlnx7pL12xws0mz4RdtJfGPJa+EigsWOrZI+u/PuLEotSuh3cUrMO6wA4BZ0SMqrdRaytpZ+leiJOSX2PRpywCn52HOdGyYoQYuMra7FZVS3lhQEa0D4G0bISw5GGOw0rMmonI7hjAnZWmf7kIGk+JZIqJl807c2khW5Tu8MEdbbFSZmZh0ORpKjDfgAYA== 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=oMWyzIRgTveyLoMGLF3s1j6KGJf1VZabkqUcSTUPQ5c=; b=rf1aAw/rkcNmUdHPYg1yvlfmZ3Z9yZ2fB3cHCkBGUgVryTIiHLvPilNd7HBeyMavZ/QzBkVuQSFtV9ufJNKTER+JQ/LaUnefLvZ9tQYfqTamQy0UGKzhzkz06anXYaxU4Qa8N4jTHNxd0FQP0y36oxYSJNrk04T0lGd3XEkSjp5r1xRxUpJKx2/mJH0r3ZNzc07eI4vVrUTmoNNB5YAUmgQgZUiYGXiTCxI2+YLkT7fm/TDPHij6wCwh4TXhYIEO/3fxDZcZYGuzsU2jDnLJDFaLN7P3ahjkuZ5vavfd1d5Kz7bywm0apCMRoyxpmuvwvl9qh0zkmMuBeWMlsdUNhg== 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 AS8PR04MB8932.eurprd04.prod.outlook.com (2603:10a6:20b:42f::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 06:40:56 +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 06:40:56 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v2 24/32] selftests: mptcp: userspace: print out test counter Date: Tue, 14 Nov 2023 14:35:43 +0800 Message-Id: <93d0892894d965265aeb963f1e96fd65b44a9a12.1699943337.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TYCP286CA0254.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:456::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_|AS8PR04MB8932:EE_ X-MS-Office365-Filtering-Correlation-Id: 2675f5fa-ed1a-41a6-7f78-08dbe4dca81f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: G1lpTQOVWlLUTPnfmIk0SW63BWZWlQEGIN3iPamG4FMddVle/ONzsjizWtQzmvRNpdBnjtjkKeW058Sz5d4TSPBOHHikY22Hh4L9lFR8daluGLfWY6/SKk3RAbsK189YcKYurE+qeAUqoPZhFWZXk9hbMGYdgSP9p7vGAByRBV8queB6x5QegsYth4GOQJwj+gjEjYy3K47ocZv2a8AL2h4IlWZa4RFcYVka0wa01r/SGzIet1+WIUKv391gR4upHJ7gJnl8jF56WtCXhpXK0QKXM5wh2f4qtYkPJSKXmsSy/7SRXhSGncATeupc79XkhITrDUPdasypK60gjQ2m8bkg44adAVGBySe4vJVUb6t0RjB8ZEsPeQtb2cSdWz0CS/cgIIxh5lvgZV4dbJtp7btNTjeSiQTHO3xGw6o7vyIhPV67B7nbWJG3b6ETNzjhXShtOxo7hTnXirqqQghob3XRBIeo7WoJni9agGB3/egqICpOL7jdalmDPQuUhQBl/z8yO45jG51XOFMtkk99dF6/pJWmRowJx+4YtWwmoKCIZoJD3veKyocp6lgAFSNE 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)(346002)(136003)(396003)(376002)(366004)(230922051799003)(451199024)(1800799009)(64100799003)(186009)(107886003)(5660300002)(2616005)(26005)(6506007)(6512007)(44832011)(6666004)(83380400001)(2906002)(478600001)(41300700001)(6916009)(66946007)(36756003)(316002)(66476007)(66556008)(8936002)(4326008)(8676002)(6486002)(86362001)(38100700002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?oLrRaQhmPt6tcWb1LaPMoqlt7w3TWRiiowh7kN3GhhqpVGDNsyYXtMIeGjUu?= =?us-ascii?Q?57eTMkdt3+YVRkiSenU80eZ0Sz1mPq10iqLmXan+4F55sDLGOP3vValhtttK?= =?us-ascii?Q?u0OTR/KHsKr/jL/zkPI1gfk2Foq+x36OHKbmCNAhQgl/CznxvsTK8WvceLCY?= =?us-ascii?Q?CjnZqx0WCazuwbMzRlSzfXlhHJFatDTPUCmOduATuy9M1hk5US8VTzRT4+xv?= =?us-ascii?Q?4ig1+Z7rvmT24tWR/xKi+80/mzLjYLIQHvOyEz3mYNYgkjJZPZGeWvuojNoy?= =?us-ascii?Q?TksWVZRbEnIKUB+52gbWGx24E0QlCXEKRJFIjByLwtFKfT0WvkSIPymWduPC?= =?us-ascii?Q?BiRllaxzMVqsOBRgV6JQKsh48QhUuiSDRbG1smTS627fzUEowuWzGi/P631j?= =?us-ascii?Q?GEqI5td302gXWCDL8AJbHniVbMKrE9e6aGvkjwD8oog7ZCcQTExHL0NZvDy2?= =?us-ascii?Q?qp5ECX2YWxqlkokZ6BCkLENhDTntBypOZm3PZUKeplisbdUkkDznakLcQvP1?= =?us-ascii?Q?n6aRrqs4L7Tvhm6LavvTvAMSh/3zh2ohMgwZ3+yM/byMpnAZa7lcQEeshBO/?= =?us-ascii?Q?7TFgzXUx9MSHZt3qKOAE3ZLzjKkVvo/mvR2zV7GQyyuBF9TFMYLbnlFk3wKH?= =?us-ascii?Q?lx0H6ctKt1ssXDCwiLjiH3EbtNfu/XAGPal9UqhhTBoNrCSLFpBUnL0uQDuZ?= =?us-ascii?Q?xplndsVJUlBuDPD6fvKUhF48F7ZxxPyvb7GysvLzFDCufBWUUhltFV8+NWfe?= =?us-ascii?Q?b07d4hvrD+BsPouUL6D6fl5a6MQ2qeEfh95rRJx86GF3rTnb/tpAVOr1Wsf6?= =?us-ascii?Q?/4iBiL76p9+k8gdd83yEdMrwTP3j6+1UB85QXlKFVzrcRWu2dJ858Wa9afQ/?= =?us-ascii?Q?zkS378TBXk8y1jPxg64P1iwRrH8ir4o/XQcU+pLiHqOM35VBFyjNi+UD0X0F?= =?us-ascii?Q?L8+nLf7cVh1O/yFKtdpJcqtUUo2Cgds9ZBq4iWNaaebqZJfsF/mXjBpmw9S9?= =?us-ascii?Q?MGWu7ppsr0IngVATSUdlAr4eC1fv/bIL8dUg8GqfX7yvXn9umVq9InpiHqxw?= =?us-ascii?Q?A9aw5n6rnEKCr1zqO1SnWinzslcngsdLb/UcqN3etTatUfQSv3ZB6AT50Iir?= =?us-ascii?Q?Fuc6E3tdX3ePyjutulP8tFqg25Rs8KG1Ctyln9ZpKjM67hmiuXIDjiJoj5bC?= =?us-ascii?Q?yz5gvuhG0T6lFdslBlgyZD5dn1Kyw7GkBp/xruifSflQi6Khstap0hHHsi34?= =?us-ascii?Q?C+biJFH9uxSz1+vAbs4l+bOfTdqwCCmlibeDrOEFzqU3i40SyAy7e2WdU61n?= =?us-ascii?Q?UTolIfn7nmZrQXIoMPqfjs/doQilBdXeyb+VX1OgOhzqAH4lEdsDidvv8OzL?= =?us-ascii?Q?/eJnrSTlhdHUbmCbbHTPeQ4+y/Fd1m7JHIrkOhl1PMo+tTUWxVhpMpAWKgtU?= =?us-ascii?Q?OIvOtJEYXqAGJJICG+Amt1FBn7uRjkWaZaGn7vA/5yO8pqwxit8bL1O7t4Q4?= =?us-ascii?Q?TnfbK97orLhv9Ugo+UaypR/K9wouh2Q5CWmbbRbtIRfypsEUu12rESy9ez52?= =?us-ascii?Q?p+frcFaGOrSbWUvOXe0AcXYlZJha0anaAg3huoYw?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2675f5fa-ed1a-41a6-7f78-08dbe4dca81f X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Nov 2023 06:40:56.8819 (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: i5stqYgDbDg2XPFnk7mSvf7FizH0yhnC6/ghi3TQzYqxGZoT/RxWOyt4F0IRv7ZbMuIgEy1FadaaqPWzTVjgJA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB8932 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 | 5 ++++- 1 file changed, 4 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 22a436c4a77a..9399dff81dd8 100755 --- a/tools/testing/selftests/net/mptcp/userspace_pm.sh +++ b/tools/testing/selftests/net/mptcp/userspace_pm.sh @@ -45,6 +45,8 @@ 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 "${@}" @@ -59,8 +61,9 @@ print_title() print_test() { TEST_NAME=3D"${1}" + TEST_COUNT=3D$((TEST_COUNT+1)) =20 - _printf "%-63s" "${TEST_NAME}" + _printf "%02u %-63s" "${TEST_COUNT}" "${TEST_NAME}" } =20 test_pass() --=20 2.35.3 From nobody Sat May 18 15:08:21 2024 Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-db3eur04on2084.outbound.protection.outlook.com [40.107.6.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 32599612A for ; Tue, 14 Nov 2023 06:41:06 +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="yqbtamEp" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=IvbSaqVb/f9KVSGld44uchmluxFvKRSUDBHYDqWkpCJVMc4DoOZUtC4+twFoPGEU8ARapC76en2IyTgJLlR+V2Tcjy3DNpcJFkMXLghXjBD5C3uFAj6Dnzr/On+vwZrIJ2JJl0VGmgfBWPj+MsfwWppp//TejF34hJyIq7eg2O1QvgsvNMSyAAmS61LyXMJG30b+q/wRqhQ/FD6S0j95BlIdyAi//3FcJdWLkxB0xf+hhEnZdwvfNST1uT0FI2tFq/483pLGjp/7yvO/1cvNwwN65TWPw56K18dMXo646aQ0ZR2BKqg5CJ0tPJcMxkhbkjU+pnrPSvsWeJgHEyb+Ew== 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=FfTYFwfdumfrUg0A69xyNV8GWtgfbuAvEeEOU8MFG6o=; b=Wq4ftuBocgv3Q4V1U070lel/cogRdNLiGKuUtuOEZRBW2HlFRR9ALRihgef4sIAXyLA8ov0p5SvKCN7j84UjkLbgv5Vko/YIYTEPrt+iAfbPJcCUwLEn8wm5hQOTAbXeO3V1Ox5dYQZCVzbyF1VY6F9XxL3YZ763IvKejFu93pcX03LkhN8PSNZ1ixO8u69QqB9koKlKHOhMGKikarGSCPuG5zyBVbGM29hR+chNFhtCiHuKMQYHzW4/RdXmpdMLRQYddIWP6noQLScP2yXNXoKtniXDnQZ2XDcaU2bGc26hGWD4Y0hpLGuUg1pYremjWTVfWmMarGezcu3ubdJ9dw== 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=FfTYFwfdumfrUg0A69xyNV8GWtgfbuAvEeEOU8MFG6o=; b=yqbtamEpatlnrU9gRCjYbUH2w3CR/k5x4ppyx9xsXaQksRcRPsXXIrcJBd5bDQN1/Za+F4gZrgBqFVUxZQdiJ63sbZBYAAzguxzmmD8enGsh7Dbtx7Vao+G6OWTjHC2c5esAFli4eRxjt30pCRT0KHnnJ3IJmUKTAOv5IPLGj/FThi1feYI9Fql5EDfOtZM6XHLn1LESaFN2raGRrPNEJDE7Qb7DamBObCIhzoJfbMn6dGTbQxgRWUSQovuuvtYvwTceSi7vyVnfnwUT960kaesWrMRtFnd6yisQ5r052ZXDo8sz4rWIMgtjhFh3eIjrzYMWZmyBp3GV7WMOzdyxgQ== 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 AS8PR04MB8932.eurprd04.prod.outlook.com (2603:10a6:20b:42f::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 06:41:04 +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 06:41:04 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v2 25/32] selftests: mptcp: export TEST_NAME/COUNT to mptcp_lib Date: Tue, 14 Nov 2023 14:35:44 +0800 Message-Id: X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TYCPR01CA0157.jpnprd01.prod.outlook.com (2603:1096:400:2b1::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_|AS8PR04MB8932:EE_ X-MS-Office365-Filtering-Correlation-Id: 4b39a146-401e-4432-82cc-08dbe4dcac95 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: K78WdKRocKUI9wPy6R5gP9KhQmriT+siYU3s+nrvM6USCVxy1JBOTUUWpcq6VNt/TwraJJtMMTXp4iTvlssfZMotWPDkJFsKglOiscbEjkCDUe4BG2JrTBf8bp6Py/DoaQisHIag3qpXt9PO/r6QtuH6IRUnWrLjKytVqyiptNzRGRODI5IwIvyEFD6lRl4UjfZl1XIXuwqGUFbhkIbewtm3rMSUaQ0K74k/BY3hM7LvolhNOC2SYr/6HZzjvbKUTNIsYveYazORAKKpttSP0xe/4k93wKFbpIlrEA320Wgea+Qf+PfSiWRy5GVrGFQdCVpF6y0RqqiNEUUOLTffZxJEixA37ctDbz4DH8WZkO9FivfEEF+BGdNwaGD4ti+gmrwia3lMnRykYax2VVsA70psXcSVzOqezIPOqvZC3Gt63Ur7txAifFcRQGXyxXLPNqN/hATzXo+s+CSZ4Qb88q6FgCWEx7VpEhgAFl4a53Z+RqPIl2+1MyQ8KoD4GD84UT7Qaqrytoibp+NlqdiX3fH7m7RGEJW5PewG1s+JKVRJKShi/lUPNqOwpNnm7Kqk 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)(346002)(136003)(396003)(376002)(366004)(230922051799003)(451199024)(1800799009)(64100799003)(186009)(107886003)(5660300002)(2616005)(26005)(6506007)(6512007)(44832011)(6666004)(83380400001)(2906002)(478600001)(41300700001)(6916009)(66946007)(36756003)(316002)(66476007)(66556008)(8936002)(4326008)(8676002)(6486002)(86362001)(38100700002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?UAE5OsaAW6xKzPG6Y5NtPSnG3WhHUQtuUfQLTf2R8ORpK72uhAqK2RLQ0osn?= =?us-ascii?Q?evX4yJ7ZGvrWNsVPWWhffPOzUm3ekQCO0fSyEpNcA0IkPiQmrLoo1DO7lsLt?= =?us-ascii?Q?KzpV+mHd4dOAqtJp8QYqFdi3t9qZqkaBInbuiei9tYCYaF86AXICIcvR+3SF?= =?us-ascii?Q?TWfd4lnTMGqbkg4Ok2LE/hU8OwhR3u/MO/MnXKlJCkVnRjCCDxT5YvOnK7Lk?= =?us-ascii?Q?eo16oClo23lmXzpLa6PQ9/GVkZCnJZeXwV+jh0poOPMInaAkDz9WXdtlZwXK?= =?us-ascii?Q?CY71GqUCYzyOBQHWMb+nrR+x1Z4QiG4DOn3f/Ka0Tw73cluY5e29e+/Hywye?= =?us-ascii?Q?Tq3jsqPYYMpJBjiP73F3NstPTRynl5Xe3qEex0VKdQCM7tdRdGvTCvrOXUdK?= =?us-ascii?Q?V4W9qg5NjCRCiVIXPn9FI7d119kB8sPYk4eL2vg6yrH9NiAEYjP7JP99ifeB?= =?us-ascii?Q?KVdmX4s6yY3AhUxv3LdQbdvQSn8jmf+/6OO+TC1WQ4IJJDIi2O9oRNo7qjyf?= =?us-ascii?Q?hf1eVxp6jmBfFfNfzf7veny6SHTPtPFCKbkY/yZ+DLKH+eYSAUxUU6yqkz34?= =?us-ascii?Q?BxTSC8Pbljp1ri/1WTjTOInLMlijtsg59UZbLKosLbh201GuxEmlM6SXi2vM?= =?us-ascii?Q?kPQ5vogRVtKF3wde5ciBBftezAhCnlsxIdNo4nr23/cmaSjBGwk0rX/m0nT9?= =?us-ascii?Q?lzbJHI+1jbNHJwiY9bClBmR4Y0hPLDUAP7DfpoQCz3xS47/3MHCWTgPz59GD?= =?us-ascii?Q?HfVlzFOg19/TgHHqF6gtazNcVfeOHqyWhJEIXt8M/oqcJm9lnXc2AVsEhr4/?= =?us-ascii?Q?R2M/ftVRjM0EfI7SLKZbfJ/+rHEp8VHYnal9z9fZOPJPNxHVJXf3nV/XNTtw?= =?us-ascii?Q?f+579s8cDC5G4MyeHjeTls1MbyPCSDZk+XcIHlNW/5to3R+9NW3rZbxLO21R?= =?us-ascii?Q?Z6AddZBf1uJ9zBouratFiMj56jp8VqayPZzQihDov+y0fhtbjnmYCH+NTz12?= =?us-ascii?Q?91DhehOIqe0GYucnWFQ/wfRD/8J39JDMw7tAGOUHurTyyuQIUtT4O7liiuqk?= =?us-ascii?Q?P4WnDp+i6oGhmU8X+XXtQZe8rhLxDDuyLlbFZqhau30RfjTe7JWy8nOYaDh1?= =?us-ascii?Q?1tFFLtPShBLjFC4xH3Yj+TYVQunmfmLIMIzvJz4HNeaokebVAOfgL0bJeaLo?= =?us-ascii?Q?TxWfO9YAQ6j6gy/hirb54V3SPvBguabWhH8Bry+2BZOPCnWIyTC8inL19dzS?= =?us-ascii?Q?8nD6tnF8uhSLrwugIdZx4AmisKAUCl2SQBDTa4n4u6oK4Mr5N3yzpHp+2nF6?= =?us-ascii?Q?9xHv7QRrQBVZ3C2hjTZ27UXPrx6hfyPtIYw9BeS5hJ3bT0tCvbuR60S4MUXL?= =?us-ascii?Q?H5WYIp4KXsqzcuFsObp8CIevsrnyclgunOXfEtYD6CFmXYZVJ+bWCmnT1MWR?= =?us-ascii?Q?SMbwg9Ng7CJuFYUBFjqni4Jky6gKSnbHkw/CKjWP+vBuQr/q2KSDEmzvCTr2?= =?us-ascii?Q?NUbzR7jf+Lt+Xlgm45FONGLTnWFacjTxeynsE3VVJ3mkqHgCzY/v7AKfck2o?= =?us-ascii?Q?kg/17KTq6vSsR8zbos/oFIpGV3OVnpUjP3pBH3MA?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4b39a146-401e-4432-82cc-08dbe4dcac95 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Nov 2023 06:41:04.6154 (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: Xs176j9JKz4t17OXkuwJ/oO7Jcyi+NUo9y/NIIJ1WnBIUl9+6vinsS7pUZCZesagIzWcUxHFUGp9DBfTYBWP1g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB8932 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 d1bd8aa02c2e..d645bfad1415 100644 --- a/tools/testing/selftests/net/mptcp/mptcp_lib.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_lib.sh @@ -17,6 +17,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 9399dff81dd8..5620997b4e32 100755 --- a/tools/testing/selftests/net/mptcp/userspace_pm.sh +++ b/tools/testing/selftests/net/mptcp/userspace_pm.sh @@ -45,8 +45,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 15:08:21 2024 Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on2045.outbound.protection.outlook.com [40.107.22.45]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4DF7C612A for ; Tue, 14 Nov 2023 06:41:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=suse.com header.i=@suse.com header.b="Lu2WiEnh" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=IRFl0AVwKzYP+17/ttZMJ/8iGRQ5R7aXTUzhAHeeeI0btlNAB9rU2QUeyKuKF9uD0BVZG23hSiNMAF+jo2V2bi2sKyjtJB56M8JWdafws0sRpGwqYd0l9899ZXeDjzS4aq+/KjaSF/dgWaTp5L4aqU4A3EpfrFWXYhSd/hRnN+mQOlXm+kZTNRvA8eLXn3Sba2340hrC/8+zHHuelvMP+dSEfVo81noT+6dlFTTFnNnEqUim85+vctFdrjKD3vEKCbPaDh0Os8Yugj3DY5aDjP2dFFBLk8BYGvmWo7gbfP9SGF7td7mVoZF0IAkDCdroNDAtnA3kal4jUtTPCIo6zQ== 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=JHK7lM4wn8QhIUMqWSAjbumQe1nowDC9G4IoOuPm6Nc=; b=lSBGQ/fbTFHBuFRehHCHleGP1TGKnDrxMa6hW+2O6F0LgV/RvokXoxfn458XHt2tHOFIbi7aJBxP8LMv/vIUCLVOoRX0QSf9CB5kiqwDwjGHwhuzE0jole6ZyyUJRkMrHO/3kg+l8h36k9HkCxM/U7ztVyF5C008dLBYokShBZFPmKgDa2GWXhMG7MZPoZwDLXhqGPEVetKEt7AeKwvDYYH+iC+KuKruOQ+afbaqANOlMJ6tc6wKKSAGkhRLIhxDP9YJP6PUurvd90hnX8PHcxuK7HkBUDGR0Bdx4l0TclWWRDIM1lestQTJwwcOv4MQ/2vHb2hSzas6xzGvm6B33A== 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=JHK7lM4wn8QhIUMqWSAjbumQe1nowDC9G4IoOuPm6Nc=; b=Lu2WiEnhO173UPSiBIA9g1E6ooQ7f6gwZmxueMzb2uN62kCQ4t1rL1/eqL2okIJUAEXyG56SEDee9TXDfAAyZVm3uBeB+shUQIrdicat4Uwb8A0gB0Fdwief+dLE1VnjUqFvUNRTrAYD0ZtMpuymLHlH7oEElc9xTILW4tT0mxFokhoXRTCZqLVfM+snN4MVkal2J/gAQ+bdPZLO+moq+PCKzzlrDnjvIlEEo/ADcK90qogFHk+8W3awume+VQQTCiK99M2THjgBGlhRu2LOsCgIJOF9nFbNgOCkhPlkV1+zE35Joonhwfde8GGJV6/3/sQIm6EJ7Q2fGitMHmMdHw== 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 AS8PR04MB8932.eurprd04.prod.outlook.com (2603:10a6:20b:42f::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 06:41: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 06:41:12 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v2 26/32] selftests: mptcp: export cin/cout/sin/sout vars Date: Tue, 14 Nov 2023 14:35:45 +0800 Message-Id: X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TYCPR01CA0154.jpnprd01.prod.outlook.com (2603:1096:400:2b1::14) 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_|AS8PR04MB8932:EE_ X-MS-Office365-Filtering-Correlation-Id: 982eea3b-6c31-4cd6-bb3a-08dbe4dcb182 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: NNKCzRZ78RyqQQLHiKPt272nKLnTZ7QCLSbgCCm38F/s81I95Ltz4j0NsRs7glm1x9kkiebA3l8YfNjW3qUK0SthBAAexlLZ//nwlI581zW7hYlyUz8AhgkXR3wSqupg98unXMBsxahPVBYAXCIY3MUhmbjx3tpZKy4SLOWTiwWs3kgsNqcMkluevlbzRcByUxdSDIxvJ33pgTIA/EedbaiijHrP5ETj5jT3I/ysa4T6h5NtVGXoxCSqtAUF2KyGZ5Unv/Hn7lAP1pJ0aAerWbOsx+314PrWFqG1Elkq9lgGN0s54znwI8z2wHVRVQAb0Caw4NrqJHAWxX4mKrGOHUF8T4OyidmkbVzwravAnPvOZs0XFBIU1flKwJQT1d0K5vsk6Ec6195TP/YIVrK8EDrT2ypWCFJh4kro7fJLkpTyvwYkKKJVKGn8hhY/aZsB6dUKopTJrhu+KoZW72akJq6juv1uvxuujgpwZOmdysClFw7MJ5SMUNuAZXt5VwxSP+BR6yD/AiKh/7J8kOhAwe6P3Z2p+EEHDKRLiPYBaDjMKq3HD+CmCcC2c6HPGeRv 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)(346002)(136003)(396003)(376002)(366004)(230922051799003)(451199024)(1800799009)(64100799003)(186009)(107886003)(5660300002)(2616005)(26005)(6506007)(6512007)(44832011)(6666004)(83380400001)(2906002)(478600001)(41300700001)(6916009)(66946007)(36756003)(316002)(66476007)(66556008)(8936002)(4326008)(8676002)(6486002)(86362001)(38100700002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?8L5HSbT7w113GUedPPbb+qKOQbmn1Mq2aktgcxqG82ijebt5jaLJlHdDUUIx?= =?us-ascii?Q?bZkmFDbtbyFlH90tzHGY/5CCDztHTqTFnkFMv+dq//Qy83yoqh0vKLS01vuz?= =?us-ascii?Q?J6k2OLB/htkIiR6LdsupGEIEWt4Y2NezcMqSps8lJO9K3hKFkWrKw3P94YLI?= =?us-ascii?Q?/oB0oIPsU2XUG4yFPW4z3HhkYekQv90QkPGN72dehO8F5s0dGuP3JrdpZ/px?= =?us-ascii?Q?lG7mNRMSvmqR0rar2jzbMbzGECc+jquw8a1XuTZFQ6LbLf06J/TUi9jOHPRD?= =?us-ascii?Q?klV46usDe/hN9nZiGbVfaOOrwTH+cd1ajaxLWSjbEGQyKqEl4GUId0UI6eyo?= =?us-ascii?Q?D+qQppKvQObHiO+89l0UrBffYcRs7BC7EWFzYcMID3Ha3US2UbvoJBeq17PU?= =?us-ascii?Q?96RcI69SEdLJ4DNCk1JjzVTiKOpB9jw9b512gVj9iIXyOmmQ44fYkVrL0QtK?= =?us-ascii?Q?xeYXmFCDpCAMMHLK8qkcH4yXmN+Jcers2X731RxAVnymmkxkH4Fc7SLhon65?= =?us-ascii?Q?BomxDeHJws7Nd2bbAy6urBPUYDntw+qtxfQ8/v2hHxVJYIRKVA5WQEHpTR3B?= =?us-ascii?Q?mWEsnqB31lSTew++rS3k0vHdXh4sUM5hxVzQeA7aQv+sxeRsYmEPfYlwzHQX?= =?us-ascii?Q?n/iNIniijAVpb9ayLXnWKcpncIIxXVuTQNPSlsuTmeYlLjUShm8MF79vCsGq?= =?us-ascii?Q?Z9fORNEbYuAubQEcQw1nxlf5WOEKGmNerI0hAtcq8E3VUEA0V/s4pfpRcB19?= =?us-ascii?Q?/HtLm9N8QG2jvOefWwL/d35Q45mXFJKfEFRlYkAQ72hThC5UFROsAuHLEuRU?= =?us-ascii?Q?L+smDh/o2atPDKasE6FfJFw7zWai1/FQcF4D+1LhAIarz16JjKBcJrmk+4yX?= =?us-ascii?Q?cQV378otMh9eVR3ROrfjdZ7+je0uLiMeGrrAYsUTEgxTYEfyS5IAP56HYu52?= =?us-ascii?Q?WgxfCCIowN/CifWGV9i5Q6/AX+odFbsfQvJjcp5MVtCfGki6I/GXC2ljOXXX?= =?us-ascii?Q?MockxJl4KDCApTZTh1Aj+2FBBRPunMgevlrRaZ/X/WBBzKTbAS/G6JP5niFy?= =?us-ascii?Q?y1HwGLEb/wLDB9Now6JKuVFuRAC/QH4GgB/E4+792I5OjELJftASU7J1fdSF?= =?us-ascii?Q?1scVVhKuqbOXPG4LE8spzBnLNMXf2UdRDmeDDbJ/8zdNRIy/53Mxj4TXyCAe?= =?us-ascii?Q?7YGApyPgTtJC6DwnmhMwbjegIL2qcpYT2imG4MS7l6833B+XW1CscYQglyqK?= =?us-ascii?Q?4HBNhSUinm5z+36QIJPavqLIqaAIHqQZ+PEawcZtrTB1OHzJ0M7UUhnu1Iig?= =?us-ascii?Q?uSY7b9wzLe9/YwNv7NBV33c0gi8mTJVxcNnE4MgtVe3INqoFEs/i9/ZFzFAi?= =?us-ascii?Q?4Kescu1dsH/HFVB/Z5JepJxCnMSwEZ+nzwidEMBwXk5hJvGCUXZb+B9Z9SPd?= =?us-ascii?Q?YQP/MuTrXDJUVbK/n+JPQO/eBCqef33mPjdPnByuAtkdn5DWJHxvhUT8KUyX?= =?us-ascii?Q?Ec4pXHIEaVStqvdzW9o5q77fwRb5PNswR1frtdSdePeWAbKe5UQUgrm8X/Nj?= =?us-ascii?Q?dt3OjpK/Uf1vXGc6Ppm/zF5UtJzcbiq1qKv0CXXV?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 982eea3b-6c31-4cd6-bb3a-08dbe4dcb182 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Nov 2023 06:41:12.7388 (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: eIeSs20o1kbhwxFt/sb5rzJuQ5+brsnUstpBw+bq3dFqA7qV17+o90YbcWgMP6Jtkc/cmCfnKpEHWBGVSMFmzA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB8932 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 | 3 --- 5 files changed, 8 insertions(+), 33 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 d645bfad1415..11983648fce3 100644 --- a/tools/testing/selftests/net/mptcp/mptcp_lib.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_lib.sh @@ -22,6 +22,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 @@ -506,4 +511,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 e1f4ddf04bc3..2b46c95bb6af 100755 --- a/tools/testing/selftests/net/mptcp/simult_flows.sh +++ b/tools/testing/selftests/net/mptcp/simult_flows.sh @@ -20,7 +20,6 @@ usage() { =20 cleanup() { - rm -f "$cout" "$sout" rm -f "$large" "$small" rm -f "$capout" =20 @@ -46,8 +45,6 @@ setup() { large=3D$(mktemp) small=3D$(mktemp) - sout=3D$(mktemp) - cout=3D$(mktemp) capout=3D$(mktemp) size=3D$((2 * 2048 * 4096)) =20 --=20 2.35.3 From nobody Sat May 18 15:08:21 2024 Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on2070.outbound.protection.outlook.com [40.107.22.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 97C0F2F29 for ; Tue, 14 Nov 2023 06:41: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="FljSe1LZ" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ixKm38+NrMBEVBK5Jxac8K2rGNaEFmqRql3cv2FhuKZBOHa6QQTPQGsI3gKhrtZVt8A6BAWaalPsDcm6eD2s+xzBh6V9ASnn14iOsCH+jKqDhVz8iFG/aBNYmM6Rr1HOESgEW3WxJnYoxcb1pCI6CaooClwznIaiEzu82g6IgteBOhoYjjtvK+3BRcZQaoFR0keZBCNY2QoiSgOGHoiQjobizQcILNjmttD5B903Y9Ucw1ad3dQen16iqmOj4XL9tc8pmlTTzrHSdqq+WJ5+pH+zaWQknte1oMSlA94YUCeFkVyY1LS7qUyLfmqSZv4EzvazhyLXPe3M1E/fP2tJUQ== 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=C6Ezw/sUpEmmbVdOsk39RnXteZ3JAEINv1SV8R0Y1uuwYXrKFrW851HtqbespjyixpxppE8e5O56OERcN60p50DJbJaY0SJDxuKiJ4C3tAeMknbpTv+lBy85B2TeGn7jGqJcZXw2UAxZsCM+0Xq5y4tlAyrOGh6vzRtqT4a8I2D0EdZsIJOExUmOnmaOzY10JxLGmuMCSQUg4/45S7fNiQpIitWAUTi/O60FWR7whPX6DYQSZ1NI7Iah3rbNkA/JL0CdHJAuoGPwcg9fM6zXHCiSTl/V2URijk+8OXuxiHVmuykXggxa+VA6TONRRM8dMo818sH/O+mK7zWE+Eb5Cg== 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=FljSe1LZ0c3QbZ+UQFSK61thUblxaVgfgKlY0ntWBjfOD7laBSFdUbsWgAwl9MN9+JAFjxRJRxYQJQBcghS/GNUqWgilFClFbM+j8ZZT1jpwpuD1Qp/w/tBMkldlKYYxjCc4uu11FqTajSQOZOpRQoO6ZQP2kakVUNMiMpj1OHWcH9gUZHQUzx4+4JtEXO+OI6rJ1JWqGFfwRnQfjiee2fK/o/ycLKRN3ZrqOWPtdSMX5vXX0chSWyypG2OXVBrR2y8FMp9yfv+sIvhZt2xeJwOpywPryjwPFDMHXeSZljKx3RscNA0rY2fVsYHS3zGVnWY5fsqljvLEmKwFUtzyUQ== 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 AS8PR04MB8932.eurprd04.prod.outlook.com (2603:10a6:20b:42f::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 06:41:20 +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 06:41:20 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v2 27/32] selftests: mptcp: change capture/checksum as bool Date: Tue, 14 Nov 2023 14:35:46 +0800 Message-Id: X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TYCP286CA0077.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:2b3::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_|AS8PR04MB8932:EE_ X-MS-Office365-Filtering-Correlation-Id: b883114a-22dc-41db-6ed5-08dbe4dcb609 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 0RWZZcOC4DEUxn+vK3t3o0HOdE0y298lXkL0cVfcibMUOpUpp+FtIuZiY+sR96vpRZ1ce7CQvauhvpwCdCpKo2vM9juYORkXNBwUdAhZSfEAoUofI8DaciSL5vhBF8xhEEUAlGySSTRhExUdCQKdhVOV1ZcYT+FU9Y5OcotQuSU8+bvFNRrnwYdYnri06XdsNSss3CUb/nOLeyEHBfeZB/peEQmjQQcoMRcMHnfRCaPP+fpD11LJgvg7633lG04hoWuz61oAM0I66b3YAqw2pOQJnhaVtMdL2I23qYYOplLS6TDWhqKhNiEFJt94DBwC0/O+fKiHPV5xhdyKwz7t7d3uwuW4BcM6hvV6lFm3fODOsQIt4c8f8yYroqEM1jsND33UlRN+bHxO6Jfyb3GeGpY4CFjBSMMCECZKi7OZOhfRCVFqS1xGdWoLF9t4SiYfxDTKUx4GboIFxeYwH8XYm7P6cB7kwbwfauGq4zlPBYNDc9WLB4rpKzY4JGq1B4JUyPaFA/g4JcRJ8iL3R1eoTQ8/dsq1KXhQBip0c+0fQj3POzf47erG1Cc6f9fQu+a5 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)(346002)(136003)(396003)(376002)(366004)(230922051799003)(451199024)(1800799009)(64100799003)(186009)(107886003)(5660300002)(2616005)(26005)(6506007)(6512007)(44832011)(6666004)(83380400001)(2906002)(478600001)(41300700001)(6916009)(66946007)(36756003)(316002)(66476007)(66556008)(8936002)(4326008)(8676002)(6486002)(86362001)(38100700002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?AsklqSV4cL9YVn0+hqDj7M+Ojz18LM6gUSJYGCIDDqN+E1YDpeHAFl1yxunl?= =?us-ascii?Q?57FYCheN0CMw9MGihqSJypk/zMLJBcg7w+8FhDCGuxdqAKOIBxWny3MJG8ZD?= =?us-ascii?Q?WKVJk7ajMWyAnlBby7PdMrpyemS1gKqL1LgX0giRV5twJ4zOoTZZz6pw0LHe?= =?us-ascii?Q?EM+mGssGh4+L15FJWDelsULKiNI/g0CGuIc69JvBPXC783KA6Bb5D8dsZkxS?= =?us-ascii?Q?6yO0GRsDwG1klReHvsSoUEgV0X3smAtqrUiosL7f9375IF/rilMQDFniagns?= =?us-ascii?Q?LqCyuHcgh4aRQVpQ1ZW5auqyYmJzbtqr4mg+6ck8z73GeuwVRaPx57VA4Rtq?= =?us-ascii?Q?v/ymHaBje9gyXbjEKzyqzzq8xjqWieuwU/Q9A/g/xGvuvuW81/fZvz9+CuLz?= =?us-ascii?Q?Azu8mH0hLoK/DH7SW3KEGapDFzCKeDNECXPdOzndBOPF299H4DSq3jTaNaWF?= =?us-ascii?Q?CBScNS+NRowvmRvqE/6WhrS18RHkF6tvCFK0YhgYZ4GkbTwsWPNjRMiHC9/y?= =?us-ascii?Q?5shweeqnXj6j3jyGO42YjggjtS6Sh7SwpWBVGA7W1by68AirJScYVUhdm8fI?= =?us-ascii?Q?gtj8JK+4pdvTISZVows80ieVNljEaDkKuUgAqgVcIGnnDhNuxORzI/BRSDCj?= =?us-ascii?Q?GX7faXknJ/vTASFAO2oe3S2+/Yssic1kJ72a0b3eGsBVah71Rz+BJHj2CcLL?= =?us-ascii?Q?tnbAfE98G6KiAYL9A0uram+O8RaIABnZl5zw5mknEHtj+sxbzUEq5YmIB81j?= =?us-ascii?Q?Z/O3LHvRxFCqqC9+ob6PnlHuH4Je3jloyKtyM8UQu2Jx7xT9lwDQUPCp1kw/?= =?us-ascii?Q?4/DP0suR2Do26ZDf9dvwfI/j5UQSzpF6ygnCu5WcCvBhErjNb7ZF0JzMGBvH?= =?us-ascii?Q?AISY0KIZd5mkAFaSFxKAbHA48q9bRLmURdHFA7KqYNUyeV8qwzFPJWbG9GVz?= =?us-ascii?Q?LKqMsokybibFX8K2yWnADkcQpaRK5SjdOg52iR+KGcC13iknMm9V0eqtDZ3Q?= =?us-ascii?Q?GdZYp/Y3OVNZnAOWEa24n+7TzCQHrD/y1MPvM4jGRF+vlXBuvfCfTpiXgT0X?= =?us-ascii?Q?sfKgoiTIIDbKnhrpL51mSaodIVmmpq5uwrUh0l0Txq0CpkzPw0NBw43w5UZE?= =?us-ascii?Q?lt2E31Fu12XQG8cp8Pcc3Ox5iuLPpmv2/KFc6lMzGXC+3Cz/MHBiZNlZEDPf?= =?us-ascii?Q?dwf2pF9o7GFiAij8nTlwIgJrPSiNPVWoV1JoZzWo1Gw/A9yvX29igGCtIlwa?= =?us-ascii?Q?o0zNQMlTk/Ct9jO/ZGKnXjelATT9S6bA5h7SC2Qx7Hnq2kAFtXjoRutMrFxj?= =?us-ascii?Q?71YQj9GXgXO/ZmgjVY0kxSnWCpGEmjj54ys0z3CzVmFXs5e1z3m7XU/lBimi?= =?us-ascii?Q?LHUvDD+uB1DA7iQuV06Q4+zMTUf0Yot5/PAozFX0IjSGFZchnJcw0kOo9YTG?= =?us-ascii?Q?jRWv/0whtKSMiDF9epZYMqxM8RrKxMLgV1itr73/CWkhEq+u2Zt5OoRJWWZk?= =?us-ascii?Q?gc1iJg0zo8ISfxlfnatmcoM87d/5D8wja0dGFNO0c0J4wv2GK79hry2cXqrO?= =?us-ascii?Q?0ESXhkwpBPpybmZSsYEqHyYwWAXg8W/yIODGcixY?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: b883114a-22dc-41db-6ed5-08dbe4dcb609 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Nov 2023 06:41:20.2402 (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: p46SSXoxs07MPl//UK1dApi+PptolzeEzjG8KTzaF6JRPlgSqt7Kj2vQETbRL0vORCOmsDgTr3qsvrUQggpoGw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB8932 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 15:08:21 2024 Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on2081.outbound.protection.outlook.com [40.107.22.81]) (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 84068612A for ; Tue, 14 Nov 2023 06:41:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=suse.com header.i=@suse.com header.b="e34fc1QR" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XmAmAuqiSp3u/AWwDgQvUnAJmPR2ebnwz9gVa0g6V7MY0RVH/eTPqFIVLeeyIkUitoKARR4IfykOCu6AkooqNXA5EuGI6c6MM94rjZEEVI/BxOlsTup3pTrrPYjEGKQObrTgyuMHWD0ra8Gv0GoadlcbFRMBGZr9hPlcqnqoy3NbKlZNIzs6T3zbtCefqhKq0xFhEzzQu9kN0OBeKCtMm9galmvwoC22rcYMG4wxfnAhuUyCPEIL/dQtQg0Yvqh/1sXk0nKcp0v4/G146C0tcf5e/TM4lbAddVZB5z3mJlcaiH2SMPRBb3eXir/hxhvgTcoPcmO9rXK1F1nf9LApIA== 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=clNSlez4Ct6xoQU2a04gfMakeRYW5AOV2gMnUNMaCw0=; b=IL1LhlXWj1+aAd39sDFjCHBAEe4eWuvL2yDsmXQ/d4RoXHsD1DZtskttktBa2MuIwHM8N0v5TZiCw9HN2aEVGnnSp+VD6dkVazXO2jIPuCo1p9zuk/aLGWNf8q2iFK1fa8TV1fquTY9mXqaf56aP64yBCT0yzeuL9u2oEGU3vDBWF63MqMZh+O0jU81R5XzZ8gHuDmuxL8p0ga2SqHGiWrytDpLnBQ9AOqR5YzDvS18olc53JqzlWC/qCsjfnDLhBWS1jaPz9MxVLZ1RjgPWoqhO8bxn9YtYnQSHKuP4D0+K85j+cQgcrf7yVzPWtCdfhfb9tunEZ3WMGQlAalK3zg== 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=clNSlez4Ct6xoQU2a04gfMakeRYW5AOV2gMnUNMaCw0=; b=e34fc1QRAJlO054k9gFHd1ES70uuUutNan5o5RpsmJk6D4L67moCu53bCGCTP0lpl5KkCBu9onbL099zvaZx8X/p7Tkb4ACi+DBMPDBftrUDjgT9Y+WEehcdytEHElmhlF6dcMGeh09Dmw+yYxyEAy0wDifXjf6+hTiAY1uA3rWzX10eG94Wy05W/mQUvz0t2u3GOuY14yz5mnC7EahXk8IpGXWmlWia1qXDGiONo0rjwYSn3Z83h8hqPA6jw1rQNLWdm2FhZkysYwBIb6ECYw9HzObK2lstq/WJh7VnPvLEbGtASmbdpig/a/S0t9wwCRIy4DoFOBzLcDebDOwLHg== 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 AS8PR04MB8932.eurprd04.prod.outlook.com (2603:10a6:20b:42f::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 06:41:28 +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 06:41:28 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v2 28/32] selftests: mptcp: export capture/checksum vars Date: Tue, 14 Nov 2023 14:35:47 +0800 Message-Id: <7e3f2d14221c9932220dfcd7dd9d80cec6470285.1699943337.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TYCP286CA0090.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:2b3::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_|AS8PR04MB8932:EE_ X-MS-Office365-Filtering-Correlation-Id: e6010ba4-7044-4396-1f67-08dbe4dcbace X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: v/jE4AZe2iPDxWWPsm8HgiizT/Kye4YKeUqVH6ERyZlfcZF2dJ2q9j+pBtL8MLVaIBLAP3yMFFZW96Xb0mp6Ds+KWmvGh4Ikl2oV8zQUQ6+lOGTjc30XZipNGaHfXYEjlBO3isSzvPvwjJJ5e14f6wFRQa+loKHX+5yRxXMHPQxKIsIUiQ1OQ67sCwuSLmSFJ0QX07n0S6eeBPEhWs5KEupbl+mRO2rz9+GRD2OFKkzHQqsH2walpMUM5Cxl2qHUfwLNHAHktybZhtObmNTZ9XPgzTL+A5m606oXF6zeWdicKrQi7Nq7rjQCRA4KM3N5pB01FN1Afyif9hK+YdweZdUYFliX7nqJ8+NeUZshro6EiY2JDgEOPAB9DK4Fybky7GqWi/o4k6CkAJG18dPwTCHebSOUASYEgn+dFjaMuD+A+dgTq9qV7SRO8PzDZVursL5WNBkQOheCV1W3T6ha0jWiZ+wcEMc3HoxOkJZ3w+q2JMssYNj9cgPYzlpY3HtfmsPr6CescrDv6kba7y9vWNR9Uk/2iQMMwtYMBEx8lzkh3m7M/QhqIvMDu5ZGu4vE 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)(346002)(136003)(396003)(376002)(366004)(230922051799003)(451199024)(1800799009)(64100799003)(186009)(107886003)(5660300002)(2616005)(26005)(6506007)(6512007)(44832011)(6666004)(83380400001)(2906002)(478600001)(41300700001)(6916009)(66946007)(36756003)(316002)(66476007)(66556008)(8936002)(4326008)(8676002)(6486002)(86362001)(38100700002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?ueXfUcA4pUdRF09MVjWqxUpsLBixtcuZrMqrr04/fd4tJD+gqmPJx6T9yai+?= =?us-ascii?Q?JVLxt1ROQVVq+BMOEcaQGlZoZxQ7BD6m/XWUrc1IYWFK1mYjEl0iJG2mG5DF?= =?us-ascii?Q?UhCDYlfxyAxPD+v3EUP20Hr335XrLr4BdD2zNChTY0QEtJ4XNuwyI7XZrtlY?= =?us-ascii?Q?VWDCZlL3/wdxy6CFaQBc2w+FPe0sdK9LguCqz8RqYQGzyNzyjn1tcfRpVSRf?= =?us-ascii?Q?Bc0F4peUnKbYkBR8TYJrVXdkzncBL5rthgOVMr6OChuCBBSjFT/Zgz0qMVbj?= =?us-ascii?Q?Zv1VUeu8RILNomd7AWHaN1IZ8hv8xt4zMghFiVyq/gYCHJjf5dJoejPxQkOx?= =?us-ascii?Q?96Aoyil/2VDYzAKypa7AI318sxOXXSW7PyPWZakynprcYPzzC5qVLXiiHWjN?= =?us-ascii?Q?Pp1RoRHfLAbK/1+FLv4TbbNVJytlqUMhcN03Hq1dMNgfLfT6pv0SuK0B2/3P?= =?us-ascii?Q?sei6bO1hK2+tl35mENXYC2oKt24brPN8kOg9DM7PxO3kM5hP5flIayQbVe2J?= =?us-ascii?Q?IcvOWcPkDCJcZFEa45jOn8uTzvSeV8MF3tAN3tkqZc74IKR4IQfwNC+crTxj?= =?us-ascii?Q?YgHAAbz+zKvetA7zBdPazX7nPQfceXSIMEQFjZz6GG4C5/EfEVmk3DyeSpBL?= =?us-ascii?Q?n9dqQAoEQc+FvsY5M9doCdylrlBGKtW2STRlvRYp/7t+KKflP/973CzYCjwj?= =?us-ascii?Q?FLVs9JudYpiKIw7aGSFcA1Ay74yxLH/UhmDLp/1iyYu/5zKhJfUcP9EnDSmI?= =?us-ascii?Q?4+BDs+byHTdjr/YrzBCtxv0XiANbtbviCvDqm+O+/gqoNtOnJJpQZSaT3I2s?= =?us-ascii?Q?hAF39hb+NSj19mmrb4GcrE3L5TLPeqFUhVAXjmVaBIqCk5nXJHPOyxM/0Wwm?= =?us-ascii?Q?L9S7bEstRFHqMrw9BdutONjg61A91k76i/zQQD9W3866zbL8HDsBl5qAOnJK?= =?us-ascii?Q?gxBBTRzodunPOcqgnmLIPdFoStdmNZg9L97toHGHWawB7MlK+4281gPOXGEw?= =?us-ascii?Q?dSi4wMgMX/Sc89Ad4PVBMXoMm1HTxN4OadgeN6lGoWdxkf13itMG/cy8VO/o?= =?us-ascii?Q?BzXZIgn/9Qmk5MF28XyH0sJROOM0wCAAocZRnAs5eqwYaDT15tbGVBGjvVBX?= =?us-ascii?Q?l6tjXCxpls74er/uw0s06bL+7suNvIDwg1t6bc70eBOBlU5mRD6nIWHHtMSj?= =?us-ascii?Q?ZypO8XJ1STAefN71xShwUk7GNrqvZg+6+yq+GHtnvhla2OQRP6Qgqz9jfGG3?= =?us-ascii?Q?7quA5Ewuvz51lOzE/N33p2nkpseokCgjT8c2xKhEMY6R4yMdna6s+DAn0pGg?= =?us-ascii?Q?+WzWvRMJoZoP+L1jF2RnxkrwH9amOci5Z13V+kZp5f5n9P9nxwU3UzGS5YPx?= =?us-ascii?Q?2eY6r1bG6QgPsl0VngnSbx74YyvaXN62m0SHQ3yeuEvcyv7O2Egl9/ikhDt8?= =?us-ascii?Q?62udCyFFxFgmlLmA/zX9jOLIL4stVHnrJff47Ce2UgUm+8rPsa02SECYRz0l?= =?us-ascii?Q?6BlIGG8H2n71pLrddY7NeBETrQ02C1KI0M5ySIg+hTikxY06ObvjEYT5iC3b?= =?us-ascii?Q?OA2uT1kolqMomdQypZWGXA6XOk2XbEo22MGZqDNZ?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: e6010ba4-7044-4396-1f67-08dbe4dcbace X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Nov 2023 06:41:28.2469 (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: 3l4DmHpqXDiLbUYwdSa96k7XYWRYbZCQDKln1GW3k+4BZBj5uPR3A5dn5Ywcnd/ie7soorlMDhbOsVNLJykb6w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB8932 Content-Type: text/plain; charset="utf-8" Move the variables 'capture' and 'checksum' 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 11983648fce3..fd54074d5d42 100644 --- a/tools/testing/selftests/net/mptcp/mptcp_lib.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_lib.sh @@ -20,6 +20,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 2b46c95bb6af..32981972189a 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 15:08:21 2024 Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-db3eur04on2043.outbound.protection.outlook.com [40.107.6.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 0DB912F29 for ; Tue, 14 Nov 2023 06:41:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=suse.com header.i=@suse.com header.b="TrowlnmZ" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=iM0kZlXsfbYwpYmZgowYDy7KAFo3fqGFBDfftTKAhYcNOX7qI6esFnzAbT73wb+tHxqxQ/QytAA4kgtCz2Qnnn2eOpRPYZgnC+7Dg5B2qnskCOnDXBZw6G04rtrshs6eLJ8HTxHi2a11j3WP0L8CobRUJEe9kyBzbbPI8ol8crWpUsNWd43SnuoIt7NfbqMxm6zK9LIkSLNUg14lmMmmDtXNueZVp9aT00C9uC1ORYn7oX7o8HBHQvQ7pfEokA/LAYYkJMCPEJTGim4K0R5jFaTf2EDzrSY3KlH4zGiEPTaoOUeCZ3oDFvAK8xzGPWLx7yZQgJ/g7xXX+dpSIweZEQ== 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=BOwZI1HRqFNZ7Im5CdmTQchBerLHhUuZ1PjV6uFQHOsZoiNmku/JFsq9NWlTIzab8OOYBUzGJcsnkKTiHFajSuDp9FVhpoav9D4udNJ/81POcgjGBxN5vgHcAwm1VRpSwWkDToZeIzl8iMp18BCTEgbxWJRDsbS+iuYkddmDf30eOAtJABVZ2AbT8bQqZYEEHkMrf5ZoHp6hUlG7qYsgQwKZMZ92xU0tmQXc5meHhp4cQSJ+7R0m3YUp51QSWdutliXElMssaaK4uxSqkAtjIWttoO3kKLHaulLrt3ib9k9kSxqu+XImUDd1tqmaL7+ZiujPzoiyoW8vucB9unP9VQ== 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=TrowlnmZb6zL4oovagZh9uuWPDUYXLH5iuAstbJ9rVieHpIvQXQ/u6b5m4u2Q5HoW70gQjUVNi/ISvQY7c9AlasOtRYoeCrwSGU2lJLgd2fI870eo6+pe4VXV2D0GZGCJCA2Zjub+GnqVKNvfIl0CM2vkdinzaeLuIvw1PoOu9o8ik1vTy5mLIKLJg83FWnrTeSUjY7p38Zhs0Zl5aioMp6RNt1phkcIP6znBKEkiI0MkIS1bCDdj05oAmsZXTQ5kAVFhS0OILqCYOkhdjrTI9E1SU8wWQjyjTf9lCNuHhapmFo2fr9h6mM9Nns5GUlDMhd3R55RtY+eiUzCugv5mw== 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 AS8PR04MB8932.eurprd04.prod.outlook.com (2603:10a6:20b:42f::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 06:41: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 06:41:36 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v2 29/32] selftests: mptcp: change timeout_poll to 30 in diag Date: Tue, 14 Nov 2023 14:35:48 +0800 Message-Id: <7545490d4e23962c6355a8f3734f0b0e0484a0bb.1699943337.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TYCP301CA0063.JPNP301.PROD.OUTLOOK.COM (2603:1096:405:7d::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_|AS8PR04MB8932:EE_ X-MS-Office365-Filtering-Correlation-Id: 9610c892-bb44-43bf-6a9e-08dbe4dcbfce X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: BSIf4aJX4l8GXblRo1mQBnhHBhp1HMnAsKa6wWC59C6zgVofY22lHK+RVWrLIbidF/R53PCwfzwf9mH5VbhTK20VI66e3zqj+2hgZL8j5osyWKtI/MW03ZFJrUQhnDm7h7g2GALIoxMQ5rdepWCG5IfJxRMtXKfIZWA5XJdpVKdSgOcukklXoWQLTyWcdQ+FqLc67KYwgG+HW6NNphDaI2GjGmvbst6hBZnYH1bzJayNj+RDQl72FkzcXkBAxtgRPju4A8a7987lzfcOdoI1y5hHFTREiti+3v7P7u4O8aRP/Y3Gh81oVxEsNKTXf3RP94uojMxsShc+1GbbpbkjwClf4ZuN6ND0G3m6yJWnd+CB9CL+Q10LM1m/CKp31XudtlSvMrEOpEAT5jUAyVlbzngZ/+H11harn7cXos2zWQ045cP+Fkgcoif6wWiMbxiIFyC55gJcnKIHe2TV2LvMaoC70ewaU6nssxZk22GkH4fj3WNXvKlVWINfGhtJJY77H0p78m2sGj5EK/Lgeg4gKwFHe64H+1b7aO+saeQb447DToeMgRFa3bo5IG+cOVzu 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)(346002)(136003)(396003)(376002)(366004)(230922051799003)(451199024)(1800799009)(64100799003)(186009)(107886003)(5660300002)(2616005)(26005)(6506007)(6512007)(4744005)(44832011)(6666004)(83380400001)(2906002)(478600001)(41300700001)(6916009)(66946007)(36756003)(316002)(66476007)(66556008)(8936002)(4326008)(8676002)(6486002)(86362001)(38100700002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?BPO7Sj0ObAWnaA1wjNBXXgsFnX8A/Hj3yEXmCkTeqGYqbAfpQqJCAaMOXp5N?= =?us-ascii?Q?eWer+y6P6Gc/zDc24QSzk/hMb8U6n8k6BEbVfITyBfjxdgyuFCs7ks4S4+vf?= =?us-ascii?Q?jfgocZJ2L9mQYJqmydWEV99FX5rGpk0tKZHxg/CKN43pf3WPA1Vzd/l5APux?= =?us-ascii?Q?ab79hsOQ4t1Gokzt//rqUf6z5kilM6S0b4LoQOGbYSG4y6McYOg88yG1RIrh?= =?us-ascii?Q?BHP3mMq85uG296Z9ES+0sIzJvCRZJJQlcUERihQjSyfC+X60PIYkPq/aJZbz?= =?us-ascii?Q?fV97BMTnWEnCeYEVwixHDXgKCdJjF/ek3dLWvPZhICuyCcB2B84c7wpIqqtl?= =?us-ascii?Q?KCho+AUp+C/G2DwSe+NPfjbMn/whR0QQZmZkDU3miYqtD6EN5NVwTEilMJRQ?= =?us-ascii?Q?gD4tkcHXS20BlkKvvkB0Ioqlo1c7jm1SkOKk9EOHmVYz4NrcLGO0aizEDkkL?= =?us-ascii?Q?rJkvpT+XL8pTrHg8YUQIHf8EBSrDNl1LlunZx8wMXDndonqtc4PJhLznO1Tb?= =?us-ascii?Q?coQu1+TfwCTUqM1Y3Rilyo0G1C+lCYPpYo8uQjEvBbv/VSAvAst53z3npv9w?= =?us-ascii?Q?i8UeAiazf3IwQpIaH/dhvy/PqJ3DMs0PLQnAZTTnI7rCK3iFV1hd8pvWQ4N4?= =?us-ascii?Q?AqrIDeTBGL1Mw9FmQQY2g0dVUXx8ibn2DJdypCuUYpSh8naKPKlAF/kxqQj7?= =?us-ascii?Q?yWydKU1k/tMo+GLHC8aZuWYFdDmXtbBIzyUgw9/DDdLw5lQVsraigBygmBtW?= =?us-ascii?Q?Au/PHWsbCBNXalfZ1swP7bRWDJcstIUZ3IMPrMJ4DhNOxFvzpLhx3SkWoqk2?= =?us-ascii?Q?cpFyg2tVz1J7/5ZsiAGqiIexfp9brRfCDMGFw69VwEAQPs4ZDi3dipyrv7gy?= =?us-ascii?Q?cXtrZI63ZJ+Dm/0Girq2U4hu+WfGkklwdt4oJx/sodBHQttkzg5q1qssIbms?= =?us-ascii?Q?yawGzxyRTBzVoyyZS4JQsh3KnoRMvV7+wV7A4RoORQmrUW27Si4gBU6iUjRo?= =?us-ascii?Q?KTHLga2xKRODJ0s7b5VZ43Mv2MHpGCIpeYxsN2KRTKzi9BipkBVXVS9doGCt?= =?us-ascii?Q?p6NyfM30V0KMdNP5+wuXWTQ39qUovk+cBy1/MUoo2YSXiMINsi7Hf1aNXVQ5?= =?us-ascii?Q?iKFpW/gdMKWCeivVQfPqLBGRCje6IxaoEUSYSO3/sU1mDfrpExBV/sueGCnx?= =?us-ascii?Q?1XLmJ1v908RWW3MWtZMT49VzyP74JxQ4tYcSToWTYnw8sSte0n2x+4occG5C?= =?us-ascii?Q?Uy4gxD5S4STHd7RlmNeD0taXLLHX0vQWsRjCNemfK+99MvXpHs0Mxs2YpDMB?= =?us-ascii?Q?vtzPNyVuTDWk1yAEolU/JElfVC8mJTVMdP4kkI4CXWs10XAp5n+ELFaXRCkc?= =?us-ascii?Q?H5+1GwLGIDLfRBYFeSb99YNrnV4SweGw70SA5vyAjNbR0pzTxLpzTtAo9e9S?= =?us-ascii?Q?X8zfh3SG06kZ24lkSIw4CdaE35jrG+UwcGWfYY911ZY6109FEB/uc8wEVGY9?= =?us-ascii?Q?JWSdNOVHiPiotr8cEl1k7nSTp/leJAHgdIOvzE1gSQXc26daOuBHsbOW3OFo?= =?us-ascii?Q?8YVUD0AHqg7xw33GsgqCP4mLovTqeS7xRxp/aj/6?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9610c892-bb44-43bf-6a9e-08dbe4dcbfce X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Nov 2023 06:41:36.6092 (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: RiGzjmIp4WIc9dkrF+fYZI4Oo9giMksR/bWQkMpZyQSpLjtFWwxGDYcld32KCg8crOvo7ve0Q6JYwd/1LZymjA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB8932 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 15:08:21 2024 Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on2081.outbound.protection.outlook.com [40.107.22.81]) (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 21F3C612A for ; Tue, 14 Nov 2023 06:41: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="vdT03B37" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PrevQogMbE2oTUZcRVV14kYVhY7IPXqe6eBIedcdhdx3OmNknHBc/kBRwgNy+lx/RxB8z717C+ZXyTbHqECBWJe7OH0dpAM4f4oOJjoZxb6SIwc3Fu9Wm0AMvsBrrWMCm6wMpneiBVPVYGxp9mUvfSBH3/4xK4lD3kbN5otPjOnlMCl0SQ4pzJb8gBXMq2lUMg5lRAqlxK1e+sPG8Z4hyU2uNb9pt9bVjqBaZOTJYE+nsbgzKiJFemPqEqL/1dawtrJ6WwMG7zyYZs/fsEFkJeRevzh1BIxHxcm84P4eTU0BdWugE7aG2orbw1cLiOAoaCTGeoG6y64Jc+FKoWPdTQ== 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=/3BCn6v/3t8cDRrchM9NcZkCTbYGzcZxtuPvN+j9cQ0=; b=cfnJ/3KveZOpbjbLgwtaPy/HfuMZJhVLIo0HkygMjGnqWKtHaM++zvqZ4wv2TzpTCxEtG/3fK2JEAIxEabH/PXQ9Dv3hpErk4i9moLGgnSQQfHBUoViedwwmE+x5bAfWVUPixfsePwBDCD9JXL86s4P7eh1vDh0ke7qJh9CYhkXD7cIBiY2JY7MCpYb3o+sZA1O51eDHG7XiI/HCOaPbC9rIeiCxXyDk4mI7jcsQVHqg0ojjYdumlp7q1UY6QJ0fbDPS4m0OR+y4C6gDaRP5PqLiKWhjIWc7gApgXjvhnUOMewlsqndymrFAXJkqBeWCkeMsLhESCjLGggQ92ac6NQ== 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=/3BCn6v/3t8cDRrchM9NcZkCTbYGzcZxtuPvN+j9cQ0=; b=vdT03B37hGTe9aYJ1OMtwcd/X51XDDYFWFKJ+LQXqwxD4uvGvd/Z5XlDLxPY1zi2w29VT9C0u82HRjGg7b09bsU200zpTEQULiGSlCBkcBiiy7yauIizWvjNfKUhM5K29UqLLSVB2I5/sCF9Kwu+9WsOo4qO/30nNRFqplHYyTiaY6elPV2ZLWZS5xCSazgdkunIGs6M98YKVijvon5ZKzhywzS2nAO104bHxHFpa/jGkWJf0nhQTdAODGpYtWs5OINRvEJEwxkc527L1oXwxfIZSTgennZQnUpjEiVBttMSxTlTnB4+XGwiwqTXYOHW+hOEvJ+f8eCmcZC0KqbixA== 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 AS8PR04MB8932.eurprd04.prod.outlook.com (2603:10a6:20b:42f::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 06:41:44 +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 06:41:44 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v2 30/32] selftests: mptcp: export timeout_test to mptcp_lib Date: Tue, 14 Nov 2023 14:35:49 +0800 Message-Id: X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TYCP301CA0061.JPNP301.PROD.OUTLOOK.COM (2603:1096:405:7d::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_|AS8PR04MB8932:EE_ X-MS-Office365-Filtering-Correlation-Id: 170512c3-047c-42cc-6c2a-08dbe4dcc463 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: UCLPlYh4SbON8ZVv3Xy05rspaJX0fvI6OvchMEb68WkMaV1tIdjmvDwrD4kYLgZrJ6TXdscbGdTJhHIPXkXX6JrVWcbmrrQXe9GvjJpfBg+kOh0z+eU/zWLYS2hXrz5gztIF5CfNF2AFHTMTb/oSThQH1Fj88J+FBT9mWvxg5IoX65NveYIoSdMp8n6dGsc/jOfNE+KnuaEd7NrrvvOylXpRbkUkGT+68DJl6dTS6LtJNUxRZ5qGw8vaR+o9kHU4EEnWRyigI/66yUiXNgr54vXsvO0Z3skGLzVu3J4X1lZZ6lLZk6Wn+jCkGIrzp7RjJU2uByTSQt6ntyHI+zo3qIyJdQtpQHQrf6i0J3aIprMrcvcNV2qFHdZbm2o9MIVgtTv5TcvD+M+Qpt8axsMZCOw6p7Xt8hKa9CgQ9W60n+cIaMvYa6kbbBRiG4WaizFAg5HBggvJas7OxdmZWACb/a1s19JtYnjGTy6fejcsqEDBzUcCqoamRbfBiFOmt7toeohjZ250gStbqPuinjNG75qCxFqOsOf/SIIuwjnTorhx1kmECu/utOFB65PwesHg 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)(346002)(136003)(396003)(376002)(366004)(230922051799003)(451199024)(1800799009)(64100799003)(186009)(107886003)(5660300002)(2616005)(26005)(6506007)(6512007)(44832011)(83380400001)(2906002)(478600001)(41300700001)(6916009)(66946007)(36756003)(316002)(66476007)(66556008)(8936002)(4326008)(8676002)(6486002)(86362001)(38100700002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?7yLmoTqz3r7jJE46BUBqfBShCvnwXTnkX0piTcfqp153Z6/NvuoLhfTCnhfH?= =?us-ascii?Q?pfDYm97PoDsG30Ej1+W+CR5eWfckFHmruit74xdJlyrMUFj+TMkaJ5bxvl2F?= =?us-ascii?Q?yARJXl14+kG+ZBB0eKx8j+k3GNJhTF7PzTjw0bQknaNvpQ53EA5pyj7UGxr9?= =?us-ascii?Q?jUz+A7XKQH0+mrT2CgsLgIViIpwm+ZwLODHaSg6yWxqtBu7FBh1+vAAPuCus?= =?us-ascii?Q?xHOONhlo2KgF77lJ6IuWxTGWvFcMLiVQ1+XLVZ+4iUc4TpKBQPlr6eIk232P?= =?us-ascii?Q?pmVq+GrBmqI7kdRVG16nmIDoDVA7JdglfeGw8Kv37eYhSlfVERAZsesb2zT/?= =?us-ascii?Q?/FLkP6BNHYxioEhv9a2TWSFs4g4z9EgwyOLlq3V1d6sZt25dAAFqFfWhNzCw?= =?us-ascii?Q?3qtEZQcCWVDWh5qMuWX/fntYT7tRfFaPYlvWNg8VDtdxWtnYbgbMA2hC/m1v?= =?us-ascii?Q?6AcdRGm0Y5e3ajH8ic3iTwn2Vfz21rT3Vdi9qJzwXxnGG4/MSnFzR2vsq+cz?= =?us-ascii?Q?s41mtjvG1l3cvu2xcq7kWArOI9eICigjePSQi7v8X4Rfoql6Q3w0zS6CL3E2?= =?us-ascii?Q?vDO+676Bypb4FtdNB/hr0qabBf5jL5u5tvIjPXN5Fzy4RfcCuwCzNcW7fR/G?= =?us-ascii?Q?NP9uyRSD6ySE/2K/XF/0sWMz1qskacTihF2CKHhhClSn/jlx8ryZqzP0qTdf?= =?us-ascii?Q?ASlD4egBL2j5OQbAQ+GZhC06N2p16bxPUcssBcvSO8G/ElNIwJBxifbfRUjb?= =?us-ascii?Q?k1kCCvNCRnWTdNytC5WlT7uzGNsPHu6GiZDHz/x0Qt/kTnvXBXBonuLQFVxg?= =?us-ascii?Q?j8nWRJFP2ItOOVRcyPuy+WLu2CidEIR+CabvBNOmjoBhbEDHG3JCuM05mY/W?= =?us-ascii?Q?gVRz492eWW8G5XXcHb1Y+3lyoHrWOme8MFvSerQIikt0WlJhC7xZDQMFcP03?= =?us-ascii?Q?yahFC90q9LP1kTMTxkK/wQmFDji3P8eMhwfp01bcnGZIQalW2HW0X03dTIRH?= =?us-ascii?Q?5HVP5YF/42JzA4nsGFyx6V5xWbXjnsEG2nMs/gHf897Ax6mXMi1R76YQeYdM?= =?us-ascii?Q?4srNcGYGr79qfgJpLC7Wqj480KEHfSMq621WPb5gf2pfmg3dcREoEyI2EB0Q?= =?us-ascii?Q?Fx6ulJgdnLbBranBg7SJDyuuL5aAQVN1hWXw5ni0T5up4Uw8hD9tFeJU+3g2?= =?us-ascii?Q?aA+f9rrq6ns1YwFqb0xvQQ4T/BcRN1SzBE1/0rG7Lz2TxQ9Zaq2RWfQCYKmS?= =?us-ascii?Q?CL9MhaULZY83FEAMRLJ8Jlg1AlfU9YSEf+INKZD9wLVTrl9kJnLTIwYJ5mUF?= =?us-ascii?Q?Ak9+RYAsUa8FkBYOI0nd6YSAHaCOyNuwNOK2g9X/LEaq4nClWuS0I6IuUnU6?= =?us-ascii?Q?PFDmY9OEEL/H99mWgXLBWwkWFRzMdprIaLDUAYi6aVvbmus0LuJr8yXNeFz8?= =?us-ascii?Q?7t+mYD7YIYHCoNmGYamx2A5l++BJldj0/UfUOJ9bYUZ9gEt8sQUHD4LcHCQC?= =?us-ascii?Q?4ijWt75euZhHw1+H1AD01v46gM5wXu5XnvRkpR7uKlMUMuPfwN6dKh3EjF47?= =?us-ascii?Q?XGOlgVEwKekp+iLzgmz3onKrKTpVTAYNblO3AaXo?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 170512c3-047c-42cc-6c2a-08dbe4dcc463 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Nov 2023 06:41:44.5705 (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: VzVEXiDro2YHYNicOvH3hTah/k1G1qigJXgl+vg/BjYZW+J/kCj86U1GAczCXjlvg4nWr67xOeDPl8uc2Ob+uQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB8932 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 fd54074d5d42..f404ac8d4b14 100644 --- a/tools/testing/selftests/net/mptcp/mptcp_lib.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_lib.sh @@ -23,6 +23,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 32981972189a..0ba26a749571 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 =20 --=20 2.35.3 From nobody Sat May 18 15:08:21 2024 Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on2071.outbound.protection.outlook.com [40.107.22.71]) (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 27ADC612D for ; Tue, 14 Nov 2023 06:41:54 +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="N41u/VZY" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=auj7mVlkxn8AggI0s1X8tf1oRkfBISOb5I6OqeOODNpK32SrrAxZ3f4o8yLe3zgYmzXlFS6kw9pQuXTMUFwhPwiDvSpDbbdXSe2aXOttUiZ1knVlnj4EtVMqkV1ftcSw0HF/ix7hfYm+5uQTS+qTmxVvyBYwQ6YNQn48za9Jv65jhX0e/OsJ91fA7LkP+kFeWeoST4v+or6rmCMs0tYFpPoE1XbBJQfElEziDxuqZ6JnxFmch6QVYVUZ0QC67HvaFj7O+vv2vOUzOo0tSVuLObBS2DIVkxlMXQpBPPOHz/yuDAoIN6c7H1w1/caX8A8IxKEYJD84aG/6Qc3JywPKKA== 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=VXAVDdJ5dorl7JQ6HCOnXprzfj8BFPQPgImQwEpdAq4=; b=Wl5J2k05G+o00NQoHfzR08OpwdQF69Cudh9X+62Q/dF0pz6fSFQvysANTHUL1dYZkJbVXttc1ejVWGjbRHUz4aPrU62eVAwF+1JkUu9Upat2WcOnd86pjfbhPsol2sJJ+lALMPEU0mfv1sIeHBJMBpaUaQnvUlmRHSLoEpJrctxhHgpT65ka4yQ+fcSK3xJISN9qKqCRVBx+h9GCWF8AVAS31+If0kfUKS9UoQ1kTejHuUH6uMe3hsjfRm46HMf0EXZP2weGrOnwc2IkNIAO8n561C8svGPl6CIY06XuDyd8cwkVPlIzSjE17029VLrhy3TjzkaNuppD3BhI7GbsaQ== 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=VXAVDdJ5dorl7JQ6HCOnXprzfj8BFPQPgImQwEpdAq4=; b=N41u/VZYqqie2DPJIjAmBvDFLWVE3Hp9wk5bA8u64yqAXw8jtr9Mu0zuXYk0oeMd923OrlWxxBFI03BJMXzpMA9zJX6yxqPFJG3KXz5rEkx+ISOL91R5Og90/mwBoO01B5y24u76pqqIE2YC7pCV6lHqa9E1mhQMC9l/57IkFzMM6L+8p6ZhNEhSEbY1xrgzccP8SpstfAf6VcZEiugihEphf2MuJkMp/b6ChYNhvryxinScUc3fRy/tecKTpm8cmP9zIoMM8SWByn/byU62lxOV7J61MhfshOJWTXkvKc9+130Px0p6rKsroJEzhSkCqR7HuL5Z8B2Phgzm7Cqrvg== 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 DB9PR04MB8480.eurprd04.prod.outlook.com (2603:10a6:10:2c6::20) 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 06:41: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 06:41:51 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v2 31/32] selftests: mptcp: use KSFT_SKIP instead ksft_skip Date: Tue, 14 Nov 2023 14:35:50 +0800 Message-Id: <70ad1f035a11dd476c34247cf59b29cf2e06ba83.1699943337.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SG2PR01CA0143.apcprd01.prod.exchangelabs.com (2603:1096:4:8f::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_|DB9PR04MB8480:EE_ X-MS-Office365-Filtering-Correlation-Id: 434c09ab-5603-4867-9988-08dbe4dcc8a2 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: lHD23VZos2ND4l7Fn+9GC0eQLgxwff4odkrw5Shk9Kpgz2+2ZKq9Xi45S28X29mg170QvR6qd6reYLxoArxYWzNwDfQrC4EjVCiAWQOz8M16vfGqQV/NmmKImLmluX1nkRpXjlgLJD3ax9nTCHu19GJzqh+AeXvBu83yaWqe86VCIB25GL+d9HhZ0dHXYnxraVCM7ainHLmmluOjeniqQGRFvOirTuZL8RWn7LBsFm7oGcMVyEpZAU3KGYPERPDpzgZIiPVBZ22dQ3RQfpE1sc1yxYbO//cNtOCARTHtfb1RY1Kn0bspsviBsohH8gAnAL1ybMzyodRZqaLfCbIYUxh7TSCCo3txSUrbT2RSg7kRYpMmyE0RJctivi0fF42BhMIdbz9EHEftCuEqQEMZbs/aTG7oNtFxpcLUXtZ6p2jWkjthDAIrVT0wk2gHx2YrH/f8BtMY3c4xnAx100MiUOZmbxVPgWed1S3q36f9cSdPEFejQUr27YK+27pD9sHfnJYjj7FhOESMPMIUQGjAYMBACLmfachz4ecu9LNxi/55Jr3ckHeNVVmMYi2s+MMl 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)(346002)(376002)(39860400002)(396003)(366004)(136003)(230922051799003)(1800799009)(64100799003)(451199024)(186009)(2906002)(41300700001)(38100700002)(66476007)(66556008)(478600001)(6486002)(86362001)(66946007)(6512007)(2616005)(26005)(107886003)(6506007)(83380400001)(8936002)(8676002)(4326008)(44832011)(5660300002)(316002)(36756003)(6916009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?2pRC5di/F9YieKyNUbXor1FApZy2/zrf5kWThnOkaoegOOCHLprwE+3pg6Lx?= =?us-ascii?Q?SAmSTKrnjIhzQnCtHPtE3AgdOWBs8VetafSgelAgCiqBx3sOr+VtgD82T24w?= =?us-ascii?Q?+xSgV6dXNIHHfq4gsvQQCdEoTpowFhcwenbh6CStsu1VinB68QpFseSmhsgI?= =?us-ascii?Q?J5gT4FSMDiaxvt8WaHyJKyeyP5mYQwXyBSNfHWkwjneX2z+S3m3SN6NOJJns?= =?us-ascii?Q?WwWGQOlpz0Y0cXfWgBoV/7y0ZrJ8wQ9QuFT9jJDUTbPFA1UfXQCMQsPNIymh?= =?us-ascii?Q?L9DUfhubGu3l1T0hKp3YilCh5goJp0TFuo89K+I89dAj0kPdBQ08TH5cQYqW?= =?us-ascii?Q?WpF+CGXCntFH7ZNNp1B+Rf50c+VY1SGy7qooJN0yOguLm16/13QRAcCw6pad?= =?us-ascii?Q?4QRif/tflxGimpnj470NmQaDYkTti4FF0ncImzsGgA4MSBpij8OLXmACsAPu?= =?us-ascii?Q?g4gvHvMqmunJdLh6ymXL8WYd/kzKbql4LJhk40pXcCKM0Yh/peXvRRgaN3oR?= =?us-ascii?Q?s0wqiCK5mbu69VDm7N1aR33bxKmJwqkq5R6gvwnM4fgOeOqTDeEuEchCo1At?= =?us-ascii?Q?KqOgqrQz0plJBwdxbCfo5BylwpmjDN8WaKs3VEV4HpzdHOWVWb9kw6uW5P2r?= =?us-ascii?Q?zh+WcGbR4E5BdTkr/2o9qyxvf1T5drq3n5t0JuyrIpXDzL85En8kxV3Yt/MN?= =?us-ascii?Q?92LoURPs02O+G779O+6bxmsoLzes5AmZFKbZS7+0Q0pKWe1qS6pX2Gm5xFg+?= =?us-ascii?Q?jaFsmcCHkVglQbuZag4uYoNFvJ8UYwRQvFLYAjF8Bf//+aTqCMaVI23gZB2Y?= =?us-ascii?Q?WDwRay06wFaLXoF5ImY8m5mx8ScXen8ez49fMK1lTmkVsMwvjc05huw7KYld?= =?us-ascii?Q?jfXwRbYEsOt/tBGPYGUyjWU2g6d9X4anyljAHY3/bo62jtdq+Gzk7CCnlCvs?= =?us-ascii?Q?rmeYh7VmjLnV6YZdsw+liBMaLj685WUZBzIMi+0zrSf0NqPucVGAyYl3WPkG?= =?us-ascii?Q?e7+vbJKErgUSW1X6tmrYVDRCZqKCOgj1MqotySC2pKA+bALL6AOspcnMX1au?= =?us-ascii?Q?fezSTs7bREYKEICbRMNsBaJc606iEbFTMmtBTwpU6zP4dRXA9K01h0fdBAaK?= =?us-ascii?Q?G+kPWkoaZw8O7m9EqsdIvRkMW5zxXEGZdWszzolvepIWh8t7wup+iIwmjAfq?= =?us-ascii?Q?lKQqioF/ItxsLxI3oIcf17dG50deV+kYiHC1VN7narKbfSTSFkGt5lab58ux?= =?us-ascii?Q?B/8w8AZG8/OaTCyIByCmakjTjuhVxOCV5x3vDIhrQZ6nMij9Q++63LhpCOtd?= =?us-ascii?Q?zpGDO6k+6K1BOqogw+tU4fbyR5wUkJwNnCktoV/7eVTLq/+MnU0rpLmy66e1?= =?us-ascii?Q?SC31/+hRt061IJuPvZzyrYaidQSGwrAQ6QELIjtobCnQZ++6b0stFYNmTl10?= =?us-ascii?Q?UNo1+4bWz3ForynFrq2vibGZ612f1KWF+VFT40TInQU2TI1SnKR5Bp7kuzNZ?= =?us-ascii?Q?kq9RmBLTsYDJJ46mikjmNJRqO2huBdyN60yRazDuyPwEbvHO4PmBV5NTkHJ0?= =?us-ascii?Q?tnSOOYzny5cd9cmBzqhTbYhNC8jtx5HAL8XMeEkL?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 434c09ab-5603-4867-9988-08dbe4dcc8a2 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Nov 2023 06:41:51.5185 (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: FbF7TaZSaJ/sbxI3WkqulqXr+P4bWuA5c7qcR0HBoLh4/3OyXgCeRK4wB51CBz5V75YBSYIBU0W0lekJkZaL4w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR04MB8480 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 f404ac8d4b14..03d155037182 100644 --- a/tools/testing/selftests/net/mptcp/mptcp_lib.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_lib.sh @@ -496,7 +496,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 0ba26a749571..cfcdf43ff660 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 =20 @@ -29,7 +28,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 15:08:21 2024 Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on2050.outbound.protection.outlook.com [40.107.22.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 B6B02612A for ; Tue, 14 Nov 2023 06:42: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="ONU+KIZk" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LzJ2IXyqX+tGVqAY03FkKE1NjKi3fsOODRyZSLngLoz7j2qWCXhf9m1BDvPVrWYOr/KJ+BVFl+1IQeVSndo2ouZZuKnLpvw4LEOhf/UOGOPKUhvJPnf1AciwwZXGCARWlDSnaoNgca9RdYi7IKEs+OLaWo6wmdx+CpYp4f7h0+hPFj9yNSbLV9Am+MKn2uLUpun1y/pl4Vvidyn3p22xqkbDGHg3QJthoA/27rnVa9XF7XexZDFNr1yvqFXs5v9406Sgg3x+MbZ6Fhnca+kQBzKhx6Fq1iyl1BdRHO95kPwTvoQjiqoJI9hKysBWqgy3ITJpzD81QWow7XS/kIrD8A== 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=cBBbXCOOQu5+3k/n26jJWjP/um5xDWAf6WcCu4h0w00=; b=WOPISUIG5+kAtf+XrnLSGFKw8hUiASJj8cpZgFh4ELb1CcorSyd/8EHV6T4F+oZjWlQv830g8hF7ZLgFbnz/t9jF9qPPEjNdHuTF6uxiUEAdHtNMrKj85JwhwrcSQmwPNtBgkJhtgTPTqPYeeUipu69UgPBaNrI5M3QCYVsxVbX0LhulyWyBInrzQjLGzSVwYANXbRsRWL8de/8VO5QXcnmCsdLFevUft7o3bEWDD0UIo2DMfNUcOuM8MMY63QAUoCxsoqML1gr17jmUNP0lPVsQTyfNUJFyIRh4nhrx7gpNiHhTZi4mjGu+gPjaxtMrODUMEaJLi9i7LDKdZB0CUw== 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=cBBbXCOOQu5+3k/n26jJWjP/um5xDWAf6WcCu4h0w00=; b=ONU+KIZkSwL9g5C17I6vOm/s7snXnSgJ2NxpkjAOHHdu7dJMRzCmNO56L8rBT6Tmc4+U3HGceixCFGqG0sufcMlal4hVE6wzX+LguQiat5Yi3kztMqPgcC8spIZvyYsWajeRj6+gdsvH1VxbOVYdLi4H0sH2Qfnd9SouGP4mpcToBFDXqFh9hoQ6cS9FUetNHtjLHucQP8qpwSM6x86qz8XMwC/IVhVQhFxjtTrNnbVO46ma02m41+0ips/E4JXvbZagyJ9qdMwsrt5Bn8yYWbXkmcs6thMQvfyquplNkFur8DHyvZUhbGYdgOseX/2jTG6ze+QMR232KKeoxpF+uw== 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 DB9PR04MB8480.eurprd04.prod.outlook.com (2603:10a6:10:2c6::20) 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 06:41: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 06:41:58 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v2 32/32] selftests: mptcp: netlink: fix positions of newline Date: Tue, 14 Nov 2023 14:35:51 +0800 Message-Id: X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SG2PR01CA0148.apcprd01.prod.exchangelabs.com (2603:1096:4:8f::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_|DB9PR04MB8480:EE_ X-MS-Office365-Filtering-Correlation-Id: a0cd0b41-ffc0-4215-91c5-08dbe4dccc6a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: J612X/RbRSIo+naoMfys3UFeUIGFE9iGyBdz3pzhPuWGOCE1/3YpmxYjlohih5ads2FA4MVeBjlICiJ4y/W6IeIBwKhU7r/l87oUb1ViedteRg/msCB0SZd4j3QBYsLR/C6xBg4YTFmUBmMyAynmq7KTLhBFIz61vPiSLY+E/xraq3LkCR2gTdY2FVguzHmpFoX++3im1/1ZX8S7RNhRrqruLITYLAjQeHTjVEMT4ivS6pKVInI1wTARqdnET/SplnW+81D21srUNFdkWbg7ry9g1ezwlrZ6MzPxY4uXK0JKQo78mk7YXtWyBIOUYeoPQSA+aiPHuvViNpzJRHcNMJ/uLqqsmnGduP2Gyc2gyidoF24jG6OM3TlAGpyNX+zbbotZtbF6SdyrRldM85tAx8nkVViQ/WgXZyzvh0sCoG6vh1NoMji2nlpC71fuDoQ/8aLOSTuBVQDJuVGpbnDOJarnEvrFEQgp2Gf+Yh3SSBbuhtJUEbyMvm6EQHbZcj5uoDUQx0E5vUXUmiXHaooLAPlUcGxEXZqJVX8XMSTzcJUW28XE0ZdZoTZcmO/dQjQu 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)(346002)(376002)(39860400002)(396003)(366004)(136003)(230922051799003)(1800799009)(64100799003)(451199024)(186009)(2906002)(41300700001)(38100700002)(66476007)(66556008)(478600001)(6486002)(86362001)(66946007)(6512007)(2616005)(26005)(107886003)(6506007)(6666004)(83380400001)(8936002)(8676002)(4326008)(44832011)(5660300002)(316002)(36756003)(6916009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?2A0GsxnJWpx9FQDg2C4iCQeceuXuvToWjxiAkRMJKlsfWVNpHE9fufZEVgWN?= =?us-ascii?Q?/13pPUm2Fv1LwHv896Pw5RVQnQxz9FXiJVEw1SRHw+tODl3yobJSeflmV96Y?= =?us-ascii?Q?6ARhvWboC4FOu5flW9OfF6JBVHdhmPHZwPRrIKTZD7hdDrCwk68ob1k2GDy6?= =?us-ascii?Q?fLqr0/bKspi1zRIF517SziHkS18oe4ejPU5X9PB0n6YAgo70Z3aD1QrVlhEU?= =?us-ascii?Q?0idLiplheas0NUkrp5te1zjfchXOHr4fj0YjGI+i3m8OQ/chPJ7L4PAqwHJa?= =?us-ascii?Q?kliFNUsxvWyChqLIjqRMJjzdp7/GD4EViyVqIzfIRzWB3jkkRbPPd9NuNRHT?= =?us-ascii?Q?Y6TPJNGp75FFiwfhr3XKI5BNUQxbTMuGh+/M9rtJEmZHoKcRsMcZ/mwfjnRa?= =?us-ascii?Q?jKbwi+3qxQDP4iKuU2uVq9SzybHwKSFIV6BU/2FDuaCOqoi3RCVHuJhJ6OCr?= =?us-ascii?Q?AeQcZmEMCc8G6kECjua3cKbLpwy2pLE14HHAQI8KT9Z3c9q5fIk8bUYHmNPC?= =?us-ascii?Q?ajY/mUXDbZDmDvJHvec61MOaD0olglVlG8gFH0xzXUK0OS4twvmjZy+0xp2L?= =?us-ascii?Q?UoN79AXG6vLeYj6l+plJlsYLa/XigieTyoUaJikt+u2dNef5JQXElkTOmUPJ?= =?us-ascii?Q?rRieMAYsQX81QCm7TEgqxod27DSUnmswIroeRnkQNJtKFubIHXneqG26UB1h?= =?us-ascii?Q?+9IVcztstcSL1/23xgwj8NSyA9WwP0JYI8ZSrW6LiBVbdzJjqxKw+NYMjW6g?= =?us-ascii?Q?b//pglVykTbtBcgoGVNQWJoRaCh5TomPJJxZCs4qQ5qYaiFHLJOtyGT9ou53?= =?us-ascii?Q?Ih1uw7Irk0xV/SKuYeDmjqlHtaJeX0zVgEJbCgKFIxHdHqqmTZhkFObLPvWW?= =?us-ascii?Q?8OcUAg0sY8/aeNuSTShMafsltT1Hsy4RssyuD9Tf/KvJaCIHmSixzNnzn9YS?= =?us-ascii?Q?1uyTR/jdkVGnSDaL/pC6HBARXeYcVKrLuyneRBO1/GgTocM8nfd1AllJP1nU?= =?us-ascii?Q?/gv2JJUGX+pRBWSqfIUpeLe5i20P2TD/bdqQcBIhB2n40yYxnf8BpMdL4XLi?= =?us-ascii?Q?eVOoZ4SNNRtU3RfqTOWYlVwrTJLY5Rnk/pv6GNrMVi5UviSfYo2Ju85RT77/?= =?us-ascii?Q?zlcV790SmatcCu9o8ojIY2Fx/Eaqup2MO/Or2xmiTxGoPEVxBIgYc/h0F52k?= =?us-ascii?Q?TZWRYcXvizTUO8dKwUcduXD2aMX637wn/cgMWSSvzzgVsTiKlE7ewSgN1nHA?= =?us-ascii?Q?z4xhaGtxnd+rFHESxcVbv+25jUxs8rsZxfjGolWMbGxcte/hubT+ohG3SO6+?= =?us-ascii?Q?mF0PgJclW9wwDAz4n86PgQBtQnCGqYyNidX24R3uQjcDwncvRT2U1crlUrvZ?= =?us-ascii?Q?VooGyVjMW55OzWF2aTcvSfCs3Bv/7d7Xe14lx0MvY8h8ZQRR4MRi4T2A/p6U?= =?us-ascii?Q?X+0l+dZuCHc4Jcpf8+li19Ti/ZvNY60ji4/I3WCSy8qDT8+UQtUV1/MsIwrg?= =?us-ascii?Q?fHq30mEVNcDPjLWXv7DBFZ6wvz5vt3wvSigeVmkCq75R0kNIOfozNGdg0Ro1?= =?us-ascii?Q?Yc5OSwysM4Z+y56BhRNJ3IM7eVYdHSk7L4Zy5Qj7?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: a0cd0b41-ffc0-4215-91c5-08dbe4dccc6a X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Nov 2023 06:41:57.9651 (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: wSc9HWrWwsIL69c3X1PZrRllRrcIR4QCAv0r3/ybNh0RucFquWTK1s6QJgXCyv8D1MHwkDscdDDPTmRpxyJOdg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR04MB8480 Content-Type: text/plain; charset="utf-8" Some positions of the new line are arranged a bit strangely. For example, the output '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 '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 | 79 +++++++++---------- 1 file changed, 37 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..1f2e9145fd77 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,14 @@ 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" + $'id 1 flags 10.0.1.1\nid 2 flags subflow dev lo 10.0.1.2\nid 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 +97,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 +113,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 +124,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 +139,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