From nobody Fri Nov 22 01:48:15 2024 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 06075199FB4 for ; Wed, 21 Aug 2024 11:28:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724239716; cv=none; b=kgjlVfCTTzscTK3l+oR6KcI6LettVNhoYl+kEilHlPdo/YsylNPd+DuXFM70PHOL312cKQDm9hU4Nk8DSTrT4oWMexUK1+CNxGAWnIy/Mu3XGGda0H+v3MPBuDKI/vuG4Ha2NFDnGAiMHkG1vJD2UaflflD7QD1xt/9EEda7ChQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724239716; c=relaxed/simple; bh=C3OYK8VXgoKD8yVc6YatwuAiK2CNR43lCLbdquUX3VI=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=oA9ZErycQTg+qoqzBIofq4ML+j1HVfCvdRlSp3I0zMyxb2fUp9A6g+DUfsT2KH1OxBvZaEQEysf24MPWfXfdJWbawm9DmA7ZkzQl8PTaasIegMP9tUQ3kW6/5RxxSUPL+SoOJdt7K9Wced+Dg7BfapCSNxavVIAB1XyLTJtIBxU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=UNLo9pGd; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="UNLo9pGd" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 00EDAC4AF09; Wed, 21 Aug 2024 11:28:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1724239715; bh=C3OYK8VXgoKD8yVc6YatwuAiK2CNR43lCLbdquUX3VI=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=UNLo9pGddDqLERAwhtjlxIFolXF2Xri9zQ4jjW7MEcjzkrrgjS2BfEjdF/rCpTRFU DNcmKPJpRyMwser8NQvjXNWRABfVtDjJd5WX+0i/Q7OiCW932eFFZ1PnVhgw8hl4I4 Y0o6GrZzcNRZNIjcirEUM5OJqy81vpgiKcWmCL6Xi4b5qspGi9VCcJO0quqgVK8l/y GcZpfLSMPAyy208B20JpbFGx/2mG+Ad0bChKGc0ZA86tge09YQXb3Jgf83S6pqlted p0QfX/6eRDt0fHmoIsU5hr8d4ymwn0jI9RD+HExf3z50anStoqwflverXNDmLWYlOK /wjsoaxz4shDg== From: "Matthieu Baerts (NGI0)" Date: Wed, 21 Aug 2024 13:28:30 +0200 Subject: [PATCH mptcp-next 1/3] selftests: mptcp: lib: add time per subtests in TAP output Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20240821-mptcp-ksft-time-v1-1-c4ea94f41244@kernel.org> References: <20240821-mptcp-ksft-time-v1-0-c4ea94f41244@kernel.org> In-Reply-To: <20240821-mptcp-ksft-time-v1-0-c4ea94f41244@kernel.org> To: mptcp@lists.linux.dev Cc: "Matthieu Baerts (NGI0)" X-Mailer: b4 0.14.1 X-Developer-Signature: v=1; a=openpgp-sha256; l=2322; i=matttbe@kernel.org; h=from:subject:message-id; bh=C3OYK8VXgoKD8yVc6YatwuAiK2CNR43lCLbdquUX3VI=; b=owEBbQKS/ZANAwAIAfa3gk9CaaBzAcsmYgBmxc9hC9rmC79Ag4I3RsvlFMuTri2MkmDV542SU OAubVQn8iGJAjMEAAEIAB0WIQToy4X3aHcFem4n93r2t4JPQmmgcwUCZsXPYQAKCRD2t4JPQmmg cwdzEACcC2bs/BZPspyjk6uQLj/aY9fkZArZvvNbuEzaU4J+D0MTWEci9MzTKFOqP5/5eOibhEj udviqFffvuotJ/2GJ1hFpvgxtMuHQas/ox/MKKRbMyJzaeKAAd2xWtbfdb2/YUzvWAm/lmy54cT drdozzS3DHUBCmOAU9mrsw7bNIRefaIj1B9CPLfwinXR3mvwzDnJiug/a6TCShvOo+sMeDNa/HY qlaWroHus5jWg2W2PG6fiStfz8+MVdKJVFjuVvjgU2bchbO2Cezt8GH8hN70Mj2wyWnpQPgQoXq 69L2O0sTBHax9N3qundMLfgZkWcBx6fsr+RXs55mYdRgvHbX430yftNYEJWZRvdzG18NqNq7Zb8 rQdGKSWXNHtLGQmPu0RJuj6blpbbUQEJfHREZkBy+I8Gis65SxLCP6Qt2Mkb9QKFFV+wTb8B91D KI324htz2T3Pk84cypuSrVWJxC3MGZb/g4yu3/WETt/Ew+ledVXTltUXnEPiUfpxa2g8DxaB0eY n8xbQniThYht5+/g55TwtJF9y21NHv072yRc4Z2o//aCdFl41B9R2NLd390iLgwgPshXHmcmgJT Kv55R0C+DuZWqhJCRjZD5ejOm3umlFPfE2hL03d9+JqeWwUd3MlzwIRR34DAnTBfo5fcI6Q69bG vG+NyDT4XNDcx+A== X-Developer-Key: i=matttbe@kernel.org; a=openpgp; fpr=E8CB85F76877057A6E27F77AF6B7824F4269A073 It adds 'time=3Dms' in the diagnostic data of the TAP output, e.g. ok 1 - pm_netlink: defaults addr list # time=3D9ms This addition is useful to quickly identify which subtests are taking a longer time than the others, or more than expected. Note that there are no specific formats to follow to show this time according to the TAP 13 [1], TAP 14 [2] and KTAP [3] specifications. Let's then define this one here. Link: https://testanything.org/tap-version-13-specification.html [1] Link: https://testanything.org/tap-version-14-specification.html [2] Link: https://docs.kernel.org/dev-tools/ktap.html [3] Signed-off-by: Matthieu Baerts (NGI0) Reviewed-by: Mat Martineau --- tools/testing/selftests/net/mptcp/mptcp_lib.sh | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_lib.sh b/tools/testing= /selftests/net/mptcp/mptcp_lib.sh index 438280e68434..871720da04c4 100644 --- a/tools/testing/selftests/net/mptcp/mptcp_lib.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_lib.sh @@ -25,6 +25,7 @@ declare -rx MPTCP_LIB_AF_INET6=3D10 MPTCP_LIB_SUBTESTS=3D() MPTCP_LIB_SUBTESTS_DUPLICATED=3D0 MPTCP_LIB_SUBTEST_FLAKY=3D0 +MPTCP_LIB_SUBTESTS_LAST_TS_MS=3D MPTCP_LIB_TEST_COUNTER=3D0 MPTCP_LIB_TEST_FORMAT=3D"%02u %-50s" MPTCP_LIB_IP_MPTCP=3D0 @@ -201,6 +202,11 @@ mptcp_lib_kversion_ge() { mptcp_lib_fail_if_expected_feature "kernel version ${1} lower than ${v}" } =20 +mptcp_lib_subtests_last_ts_reset() { + MPTCP_LIB_SUBTESTS_LAST_TS_MS=3D"$(date +%s%3N)" +} +mptcp_lib_subtests_last_ts_reset + __mptcp_lib_result_check_duplicated() { local subtest =20 @@ -215,13 +221,22 @@ __mptcp_lib_result_check_duplicated() { =20 __mptcp_lib_result_add() { local result=3D"${1}" + local time=3D"time=3D" + local ts_prev_ms shift =20 local id=3D$((${#MPTCP_LIB_SUBTESTS[@]} + 1)) =20 __mptcp_lib_result_check_duplicated "${*}" =20 - MPTCP_LIB_SUBTESTS+=3D("${result} ${id} - ${KSFT_TEST}: ${*}") + # not to add two '#' + [[ "${*}" !=3D *"#"* ]] && time=3D"# ${time}" + + ts_prev_ms=3D"${MPTCP_LIB_SUBTESTS_LAST_TS_MS}" + mptcp_lib_subtests_last_ts_reset + time+=3D"$((MPTCP_LIB_SUBTESTS_LAST_TS_MS - ts_prev_ms))ms" + + MPTCP_LIB_SUBTESTS+=3D("${result} ${id} - ${KSFT_TEST}: ${*} ${time}") } =20 # $1: test name --=20 2.45.2 From nobody Fri Nov 22 01:48:15 2024 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 04CA019259F for ; Wed, 21 Aug 2024 11:28:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724239717; cv=none; b=hX4GG+RrBSejdcqPENZJvAwwUVwOD5IO7thut/BNLzssJtD/E0fcE415eai9u3KOF303FinYA3geREyd2WiGsQLSfszB3aMTLmlwYW2M9PrVKuf1rUqKtHhsTJ31oRRuOAtmgjpDcqc+YopAwreMlJgwmPDRwXCd1RKrlufdHps= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724239717; c=relaxed/simple; bh=rwzY4Yx4YajOr35ejccVb8MbkNsLer0JH0j5lMHZAQk=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=OXfet07m309LeePlsHhBFnQQIO2l+KUVoyWwHeVaA9w9WN9YHEm/fS3/zJCz1eGPA06OUq0UtnWf5Oh7bMD7ow1JBlFaleWx4gSiHutwetuiKzrkF5uK0bBIcjB86rc+JZaRESecovzz3KTyTfeLwD7jV/7RRmw8A6jgOPCEjAE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=fHVLHVU5; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="fHVLHVU5" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 03538C4AF0E; Wed, 21 Aug 2024 11:28:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1724239716; bh=rwzY4Yx4YajOr35ejccVb8MbkNsLer0JH0j5lMHZAQk=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=fHVLHVU5boja28fP5O5u6opyNgUofxoadIKLPmX8aur1LG/DiezqUNBY7WeL6BsEp UkFheAmQGvwk0F1BW6r+P8qGz/+0J9QUyifc7lshQ4gW0l1zfQbnULvzuCqJN0fhYT hU8kETNfVWiLveSVqTN6n7MzJ6yqo9Aj4OoIQPZekT0jqEh4PMRGOxUPYEt53/k4LN rMcVOnDKbLcEEdVy+MnrRrbZCFp+gL8zzt4guaXBrb0ntNgz9g5djRB5JExn2BA/6U vILmB4jZMW0j+6ZEdkaKXFCpX5+ggzOH8AJoYHQX5CxXhlcicgXeLjtvxRDB+dyigH Q71HuTK0vFwuA== From: "Matthieu Baerts (NGI0)" Date: Wed, 21 Aug 2024 13:28:31 +0200 Subject: [PATCH mptcp-next 2/3] sefltests: mptcp: connect: remote time in TAP output Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20240821-mptcp-ksft-time-v1-2-c4ea94f41244@kernel.org> References: <20240821-mptcp-ksft-time-v1-0-c4ea94f41244@kernel.org> In-Reply-To: <20240821-mptcp-ksft-time-v1-0-c4ea94f41244@kernel.org> To: mptcp@lists.linux.dev Cc: "Matthieu Baerts (NGI0)" X-Mailer: b4 0.14.1 X-Developer-Signature: v=1; a=openpgp-sha256; l=905; i=matttbe@kernel.org; h=from:subject:message-id; bh=rwzY4Yx4YajOr35ejccVb8MbkNsLer0JH0j5lMHZAQk=; b=owEBbQKS/ZANAwAIAfa3gk9CaaBzAcsmYgBmxc9hxXz4fF0lnGk0ZbMagkrQYcGJi/Gx/nhR6 rh2aMS9EHGJAjMEAAEIAB0WIQToy4X3aHcFem4n93r2t4JPQmmgcwUCZsXPYQAKCRD2t4JPQmmg c44TD/9vmsc5TyhTwf8QjM/AstEhKJ6z0AZZ4r7txS4jnoE09rHCxWwf/vwFFjofSHl0P8iuEnD bbA9ysOOCDAe7JuMN7juUzs0crHX7YoYa4xBL8GhfhCMfYQRF06WpQUmGa5nGV6gg2yDP6WuPME w7M+maDpTcSh2h4+natcSNqedFbuxri4n7i3McLy7n7JNPb8GWU8Uu0tbV23ogr5L0GzjcQH3hq enAi14jUmDdtiAbrqBxiK0CqDnANgZO2dwTx+h9gvHy9s95AmzfajdKtsTek6VKtYI4FEg06w5v /tXt+INUnuCCxQOPbgzYJDfEunL87FLEYcn9kh0QkeYvor+ZWcyOjF0K5FsaI/TXoXTbwyQuZ7o DfpfzHfmV30a8xKB4uCz2yLE6Ood9marbil2yBIM58aJ/BcK9X6k/br/7hgj/FkWqxHlHJebrvW 2II9RzmbGfKCPBLHH15WqFauu1GHfUwCAt0cR0UDT4kVoBMxEchNBMbEWR9P1sHrK9cn+YWb4L+ oI8il5bxcXz/oTw3DXgd6bi/vh93IsZcgICs+pcjVYY26UGcwZtrw7F02vdGvKUh+yirbW2M2n8 Pq1JPMj5d4bppJDdiJg56eVKYpuUZHibuHO6kEK1RMW5O5J8TH+rs2NUudAsC8PIjUXbko76koN jU6obN/DxqkW0CA== X-Developer-Key: i=matttbe@kernel.org; a=openpgp; fpr=E8CB85F76877057A6E27F77AF6B7824F4269A073 It is now added by the MPTCP lib automatically, see the parent commit. The time in the TAP output might be sligly different from the one displayed before, but that's OK. Signed-off-by: Matthieu Baerts (NGI0) Reviewed-by: Mat Martineau --- tools/testing/selftests/net/mptcp/mptcp_connect.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_connect.sh b/tools/tes= ting/selftests/net/mptcp/mptcp_connect.sh index b77fb7065bfb..f61e2f5870ea 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_connect.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_connect.sh @@ -431,7 +431,6 @@ do_transfer() =20 local duration duration=3D$((stop-start)) - result_msg+=3D" # time=3D${duration}ms" printf "(duration %05sms) " "${duration}" if [ ${rets} -ne 0 ] || [ ${retc} -ne 0 ]; then mptcp_lib_pr_fail "client exit code $retc, server $rets" --=20 2.45.2 From nobody Fri Nov 22 01:48:15 2024 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 AFF4A192D69 for ; Wed, 21 Aug 2024 11:28:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724239717; cv=none; b=Y7xp3JEHkNGBtiqntRdc88RJzKmeZNQgzSxLZOesca+ZE6Z5F2EssznY5zR4n2+lkaK4u2RvaTUiU9a2qgG0F0kknvaBuOs2a0UFIR3DG3PxNESAsg9EogKFlhaEiMdr1d4Oz6rR4jv8qcrVyZgvzpUcBh6KMtRPjscsvo/UQOM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724239717; c=relaxed/simple; bh=V+sMyuwmSAeQV47EFr7LRLHTvTQMgU7Gh0ocdMGm55w=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=o4hyIKsdMDPaCg8SS7P1ZPGSzD8WabKNhX5Ywu8nfgJREvjPyx4/v32h6qVnY/XRMWddHISVoUZcuOkyGK3f7rh/gA4AKxhLsdCYBBS4gEC41IcVDu75+UtOcb5HvwuzFHjVOH9Y6te71h8mtGB75FPCdYSBV9xeTqVHmBSKj/E= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=f59H5H+4; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="f59H5H+4" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0527AC32782; Wed, 21 Aug 2024 11:28:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1724239717; bh=V+sMyuwmSAeQV47EFr7LRLHTvTQMgU7Gh0ocdMGm55w=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=f59H5H+4dXUXjxxmIdf42SUfii+nmoKI6vr6d/vCsTaO6TRR2reM97F6XRNac3mmD zTc2WcG/Wgwa/zPIwJvYT5xRpe18HjGzDNSeuqnSYesH7DI50qz14SUAcDbnjT29VE eN//kqIlHZUrmpx46BL5DtmOl7PuOJmnjqqrIVxw/q5shlaORN9ORtNe5qoxNwh4FU Zuuzzmo5/cAPwvc5vgKh7ZeqHBAEn5MVOPNiQpmMPd2p5kllTGhfeOmk/x7RvLp0Tp 17DGS1D/mbjCAPqrG57tU9oxgsblQBszh3/sLnLSR+GTVILFEYOrby2aBDqg89AYLS WQc1MFfX46VlA== From: "Matthieu Baerts (NGI0)" Date: Wed, 21 Aug 2024 13:28:32 +0200 Subject: [PATCH mptcp-next 3/3] selftests: mptcp: reset the last TS before the first test Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20240821-mptcp-ksft-time-v1-3-c4ea94f41244@kernel.org> References: <20240821-mptcp-ksft-time-v1-0-c4ea94f41244@kernel.org> In-Reply-To: <20240821-mptcp-ksft-time-v1-0-c4ea94f41244@kernel.org> To: mptcp@lists.linux.dev Cc: "Matthieu Baerts (NGI0)" X-Mailer: b4 0.14.1 X-Developer-Signature: v=1; a=openpgp-sha256; l=3865; i=matttbe@kernel.org; h=from:subject:message-id; bh=V+sMyuwmSAeQV47EFr7LRLHTvTQMgU7Gh0ocdMGm55w=; b=owEBbQKS/ZANAwAIAfa3gk9CaaBzAcsmYgBmxc9h2uCpAcjTGyqJ+NsePczcqrAq+e4rzqx7y RembWOIDwOJAjMEAAEIAB0WIQToy4X3aHcFem4n93r2t4JPQmmgcwUCZsXPYQAKCRD2t4JPQmmg c83cD/oDc8/D3KUOkz8KJiM362XSy4m1Jy3BiPaeDUwXwellYIGFNU+d1t66kjq/IuqquIUe3NF hStyWWhFVJujUFDaVNxa0ffVlqlbbAfycI7YATu9810lZDkV+k/4BcMj6egqGnMnJjfXWkAqtVQ CV/gwLOqXP0JvD2/QDEl9SxjKISGWzWT85UMjB9zsYCAImGOn+d4Z2LAemz8rlX+ZuNv5ReFTBA WGqR7aqc0qwo6MfoyGQrgEpwmRZ1zWetakqYYw5gYx3moLySD1u8aok/nNg0/wKXmLR4n53YbmY UuK5Is3c61zMITQ7FKk0m/AGEntjJBA5Gn2hT0fuchqOPj0MbrRWwsJ52Vl2K1K2Udxy5WB6cJj azvXYliJF+YqS4jwzaQnEg+MC3FlbDfweebZBvJgyJ5zcNPPJM0PHQo7ZUUXOKITCpMXPQaMLAf +eM13Lkq0lH1TQMntb7bybZWYEhQLZXiAzJoPYDFcG9YetMygGcYFbMiO3WrgPunzhgfZeiDQr+ OSyVgdy8WdYoiAvZWMn89s/wRLrNtRp80HTSaHGczgCPRIkmbkF+dccf9SaD/wQ8BIzMwXo0l0Y IXwUaNMlOlB4u6QnBNC+Be1a1q2maqLPG+Xn5HcFROtGxNvIKeQZkI2ruTyBhMFYFtBb2yhWQ2v Tw15PHKfEyDhgjw== X-Developer-Key: i=matttbe@kernel.org; a=openpgp; fpr=E8CB85F76877057A6E27F77AF6B7824F4269A073 Just to slightly improve the precision of the duration of the first test. In mptcp_join.sh, the last append_prev_results is now done as soon as the last test is over: this will add the last result in the list, and get a more precise time for this last test. Signed-off-by: Matthieu Baerts (NGI0) Reviewed-by: Mat Martineau --- tools/testing/selftests/net/mptcp/mptcp_connect.sh | 2 ++ tools/testing/selftests/net/mptcp/mptcp_join.sh | 3 ++- tools/testing/selftests/net/mptcp/mptcp_sockopt.sh | 1 + tools/testing/selftests/net/mptcp/pm_netlink.sh | 2 ++ tools/testing/selftests/net/mptcp/simult_flows.sh | 1 + tools/testing/selftests/net/mptcp/userspace_pm.sh | 1 + 6 files changed, 9 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_connect.sh b/tools/tes= ting/selftests/net/mptcp/mptcp_connect.sh index f61e2f5870ea..49d90c4dbc01 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_connect.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_connect.sh @@ -847,6 +847,8 @@ stop_if_error() make_file "$cin" "client" make_file "$sin" "server" =20 +mptcp_lib_subtests_last_ts_reset + check_mptcp_disabled =20 stop_if_error "The kernel configuration is not valid for MPTCP" diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index dc089bba113f..24d74054b0c1 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -3868,9 +3868,11 @@ if [ ${#tests[@]} -eq 0 ]; then tests=3D("${all_tests_names[@]}") fi =20 +mptcp_lib_subtests_last_ts_reset for subtests in "${tests[@]}"; do "${subtests}" done +append_prev_results =20 if [ ${ret} -ne 0 ]; then echo @@ -3881,7 +3883,6 @@ if [ ${ret} -ne 0 ]; then echo fi =20 -append_prev_results mptcp_lib_result_print_all_tap =20 exit $ret diff --git a/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh b/tools/tes= ting/selftests/net/mptcp/mptcp_sockopt.sh index 68899a303a1a..5e8d5b83e2d0 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh @@ -349,6 +349,7 @@ init make_file "$cin" "client" 1 make_file "$sin" "server" 1 trap cleanup EXIT +mptcp_lib_subtests_last_ts_reset =20 run_tests $ns1 $ns2 10.0.1.1 run_tests $ns1 $ns2 dead:beef:1::1 diff --git a/tools/testing/selftests/net/mptcp/pm_netlink.sh b/tools/testin= g/selftests/net/mptcp/pm_netlink.sh index 2757378b1b13..2e6648a2b2c0 100755 --- a/tools/testing/selftests/net/mptcp/pm_netlink.sh +++ b/tools/testing/selftests/net/mptcp/pm_netlink.sh @@ -137,6 +137,8 @@ check() fi } =20 +mptcp_lib_subtests_last_ts_reset + check "show_endpoints" "" "defaults addr list" =20 default_limits=3D"$(get_limits)" diff --git a/tools/testing/selftests/net/mptcp/simult_flows.sh b/tools/test= ing/selftests/net/mptcp/simult_flows.sh index f74e1c3c126d..8fa77c8e9b65 100755 --- a/tools/testing/selftests/net/mptcp/simult_flows.sh +++ b/tools/testing/selftests/net/mptcp/simult_flows.sh @@ -286,6 +286,7 @@ while getopts "bcdhi" option;do done =20 setup +mptcp_lib_subtests_last_ts_reset run_test 10 10 0 0 "balanced bwidth" run_test 10 10 1 25 "balanced bwidth with unbalanced delay" =20 diff --git a/tools/testing/selftests/net/mptcp/userspace_pm.sh b/tools/test= ing/selftests/net/mptcp/userspace_pm.sh index 9cb05978269d..3651f73451cf 100755 --- a/tools/testing/selftests/net/mptcp/userspace_pm.sh +++ b/tools/testing/selftests/net/mptcp/userspace_pm.sh @@ -150,6 +150,7 @@ mptcp_lib_events "${ns2}" "${client_evts}" client_evts_= pid server_evts=3D$(mktemp) mptcp_lib_events "${ns1}" "${server_evts}" server_evts_pid sleep 0.5 +mptcp_lib_subtests_last_ts_reset =20 print_title "Init" print_test "Created network namespaces ns1, ns2" --=20 2.45.2