From patchwork Mon Sep 2 11:13:04 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthieu Baerts X-Patchwork-Id: 13787086 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 4BEDF1D2F60; Mon, 2 Sep 2024 11:13:20 +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=1725275601; cv=none; b=lW+AgtACmgc47NJJDZQgOe2D+BaJf5MN7oquNeBOOb7uHLi7MIKc5r75309XYWYETQFqpBd4972iRGKiD20wnjPZxJoDc2XOYLDys3GhII+OMlEyxEfv1YPkfTBLw12Bl2TwqlvaGPOZ9kd9Owck3UHuQPzFggy6lzZRMh2Vmf0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725275601; c=relaxed/simple; bh=exlr1t1z8ANjogMu+0R8MvnEWUoNjycIDoP/fjhm3AQ=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=hH06UMlAJCWewK25ahZKXzaCan38GiPpDBCoSYIIrHv+YMA/sIsraPDgndcyvt0oN2CNG4KKVZ2L64VpQ/MTrMfc00kXb1vdSUKVey9k6Sjm/fFKyQdz4CJfNQa4P1tvxQjLy/AgLqvKeLl9STHQX0XDnbSE8Vn4cOGahwBW6jk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=SCneOO71; 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="SCneOO71" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 76F6FC4CEC6; Mon, 2 Sep 2024 11:13:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1725275600; bh=exlr1t1z8ANjogMu+0R8MvnEWUoNjycIDoP/fjhm3AQ=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=SCneOO712KHGvJrk8xaYXjAg1gTzOf5Y8+i3s7trQc1gxgiqu9ciX+LlEcErCgfzM xPNs7UH2102Iy0ytRLHHvqRob/uETMa/ZiLsI0JixlmhzfONV4otuZ/Ez/dxn0zBCP BJtnd9/kS3Zebrn1jP5ui3ttltNaFJ9tXU+a8o6Y81BAOtV2S1Rq91TY3IiOAt5g8M bA6EluaVU+VyOFjC2JU5IIp1IzJBTRnEJPOqBiDAt5qfxldFd7fMpXT9zltjm4u1JE AEeeLQumlnL0eZyj7eXtRG3Hv9StBul6+uqFugF2juFgN9zBVWKuD4fDKFcZ3lQN13 X2Knbw57430SQ== From: "Matthieu Baerts (NGI0)" Date: Mon, 02 Sep 2024 13:13:04 +0200 Subject: [PATCH net-next 1/3] selftests: mptcp: lib: add time per subtests in TAP output Precedence: bulk X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20240902-net-next-mptcp-ksft-subtest-time-v1-1-f1ed499a11b1@kernel.org> References: <20240902-net-next-mptcp-ksft-subtest-time-v1-0-f1ed499a11b1@kernel.org> In-Reply-To: <20240902-net-next-mptcp-ksft-subtest-time-v1-0-f1ed499a11b1@kernel.org> To: mptcp@lists.linux.dev, Mat Martineau , Geliang Tang , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Shuah Khan Cc: netdev@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, "Matthieu Baerts (NGI0)" X-Mailer: b4 0.14.1 X-Developer-Signature: v=1; a=openpgp-sha256; l=2373; i=matttbe@kernel.org; h=from:subject:message-id; bh=exlr1t1z8ANjogMu+0R8MvnEWUoNjycIDoP/fjhm3AQ=; b=owEBbQKS/ZANAwAIAfa3gk9CaaBzAcsmYgBm1Z3LD2+yD+uDX4oHBXbvNlVai5dKy7+0+4EDp +rldDEmOTuJAjMEAAEIAB0WIQToy4X3aHcFem4n93r2t4JPQmmgcwUCZtWdywAKCRD2t4JPQmmg c7j8EACooITxXsLdLumO1s23HEYDx7DF5qYzOsnXEQwyEZ1i0bfHiqio/USi+NNJ13ZXI+cQGes qDKgotLl8EYf1MJ2udJLJZETHNk/bViF+XdqG9iO7yMr6cs6WHH+soYvxK0wSREkIKVhnl+qku6 be8yLYSnyE7C9YXCn35u0ugCVPZOZ9b3B83H6Q/pbZ7KER2IlVrbduMvdnz2pcAYqQPq4G/iPO2 CaZ7qpEemxgnXtEUl40t8Iw1WwEWu3/X56MDAFrsVQHO8XYrfGYn6uO0jAni2/Zn+tqitKFVZKn Lyo5mrplF1y6FEsLlcrGaEi++K9SbtFNZ8gmqtxqM0k0UX57hek/D1PH2d1xtFA4Fo8pvm6vduv e3fWIfgSumz5T5xYkdmOQGiHryPr4ChQE4p07dRgO76wjvPAMy8a+3m0nVzecSlxouXR2Hh+KIZ mh5itA+H05iwIRDnK5TOtADuF06uWxQvYFKXrVskM1MDxsZBDz0S3/5nUokFSp+HN/K9Kr1A6qi rsnls6jCsOej3RaOFp0/eb1YUJudr8NTlJDEXjbUUqn2qHD9feDS0jAKIW+U2D/zwWfgzg6qbuo Rx7+l9cZsRnSrhNaRmuaqCrldsRip2rfKCyVFokZ1jKcNjK4K3LWXos2Nx0NJR1C6heeVWrk5x0 Y65icQujE9b4e7A== X-Developer-Key: i=matttbe@kernel.org; a=openpgp; fpr=E8CB85F76877057A6E27F77AF6B7824F4269A073 It adds 'time=ms' in the diagnostic data of the TAP output, e.g. ok 1 - pm_netlink: defaults addr list # time=9ms 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] Reviewed-by: Mat Martineau Signed-off-by: Matthieu Baerts (NGI0) --- 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 4578a331041e..975d4d4c862a 100644 --- a/tools/testing/selftests/net/mptcp/mptcp_lib.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_lib.sh @@ -29,6 +29,7 @@ declare -rx MPTCP_LIB_AF_INET6=10 MPTCP_LIB_SUBTESTS=() MPTCP_LIB_SUBTESTS_DUPLICATED=0 MPTCP_LIB_SUBTEST_FLAKY=0 +MPTCP_LIB_SUBTESTS_LAST_TS_MS= MPTCP_LIB_TEST_COUNTER=0 MPTCP_LIB_TEST_FORMAT="%02u %-50s" MPTCP_LIB_IP_MPTCP=0 @@ -205,6 +206,11 @@ mptcp_lib_kversion_ge() { mptcp_lib_fail_if_expected_feature "kernel version ${1} lower than ${v}" } +mptcp_lib_subtests_last_ts_reset() { + MPTCP_LIB_SUBTESTS_LAST_TS_MS="$(date +%s%3N)" +} +mptcp_lib_subtests_last_ts_reset + __mptcp_lib_result_check_duplicated() { local subtest @@ -219,13 +225,22 @@ __mptcp_lib_result_check_duplicated() { __mptcp_lib_result_add() { local result="${1}" + local time="time=" + local ts_prev_ms shift local id=$((${#MPTCP_LIB_SUBTESTS[@]} + 1)) __mptcp_lib_result_check_duplicated "${*}" - MPTCP_LIB_SUBTESTS+=("${result} ${id} - ${KSFT_TEST}: ${*}") + # not to add two '#' + [[ "${*}" != *"#"* ]] && time="# ${time}" + + ts_prev_ms="${MPTCP_LIB_SUBTESTS_LAST_TS_MS}" + mptcp_lib_subtests_last_ts_reset + time+="$((MPTCP_LIB_SUBTESTS_LAST_TS_MS - ts_prev_ms))ms" + + MPTCP_LIB_SUBTESTS+=("${result} ${id} - ${KSFT_TEST}: ${*} ${time}") } # $1: test name From patchwork Mon Sep 2 11:13:05 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthieu Baerts X-Patchwork-Id: 13787087 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 E1F3F1D47D4; Mon, 2 Sep 2024 11:13:23 +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=1725275604; cv=none; b=pD8ih0E5D73eHFRW/iS/S5qIhHkeerxvP2PLu4shbHUdMXz8htsi2Rt2FeuukPAQTBXljpPvwKIWaHQ9fl/5WVye809DGWdsMeCYJMStiedwLqdKC2c6F3WIjJPEGBhp/A9PBBtC3vZQigzP1GSGNJVJiHtK72gHJmOFFUmZyPA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725275604; c=relaxed/simple; bh=3niV5QJ+FLaZE6yS8KXgq89EOVs56xOq4guNfTe9XTI=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=WgtlrbqwArKb36s0ia+Sd09N2/ws3/qD/ZM3HCeboMB3pfdqzyNHhDonWKXb8kxLo+xwTl00BZ4MdorUI7vna1Nmbh2xt7XHsBSxCNSph0iOJIw7hhZDneGpLYkyUvHjICSzEqZkbQe7/EvJUZ06C/85AGxfcgFGaCijeVNT1aE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=vBnh1xSm; 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="vBnh1xSm" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3CC8EC4CEC7; Mon, 2 Sep 2024 11:13:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1725275603; bh=3niV5QJ+FLaZE6yS8KXgq89EOVs56xOq4guNfTe9XTI=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=vBnh1xSmWc4iyTjnbAdEa9Ms4RK2Rh3lz2gZZ6sn6c77o8OuuAdOC/DUm2N2xEZyv HtW2QMws6Pt1Krz2fCan0/AflYYOl0LxdhWUx2zw2boYR82fvBZk43sGYf6W1tuLgt NCTSlz+CgtWjRvdFtjqGmXN3hdLB27E3cA98wxuD3CSRtDNYjk3QJa05gZ67kg1CJS 5hy2UR8585mIHtAYS8OliD5OhtOZHQSYxUrwQd1F+yCtNhQzLThTAIF2E2OmVmFU+C n5fGG3CjWeMcFYXEw9KUZtqPJ2753xHag1ah9DAsz/YR72nYKAcGhbgYX99xviwxU7 Td/S6czRph/HQ== From: "Matthieu Baerts (NGI0)" Date: Mon, 02 Sep 2024 13:13:05 +0200 Subject: [PATCH net-next 2/3] sefltests: mptcp: connect: remote time in TAP output Precedence: bulk X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20240902-net-next-mptcp-ksft-subtest-time-v1-2-f1ed499a11b1@kernel.org> References: <20240902-net-next-mptcp-ksft-subtest-time-v1-0-f1ed499a11b1@kernel.org> In-Reply-To: <20240902-net-next-mptcp-ksft-subtest-time-v1-0-f1ed499a11b1@kernel.org> To: mptcp@lists.linux.dev, Mat Martineau , Geliang Tang , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Shuah Khan Cc: netdev@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, "Matthieu Baerts (NGI0)" X-Mailer: b4 0.14.1 X-Developer-Signature: v=1; a=openpgp-sha256; l=956; i=matttbe@kernel.org; h=from:subject:message-id; bh=3niV5QJ+FLaZE6yS8KXgq89EOVs56xOq4guNfTe9XTI=; b=kA0DAAgB9reCT0JpoHMByyZiAGbVncuj7jO3nIUjtHWA6OuZgrlbfYngci9mUJuvqc/WMwOwT 4kCMwQAAQgAHRYhBOjLhfdodwV6bif3eva3gk9CaaBzBQJm1Z3LAAoJEPa3gk9CaaBzsLEQANcu Hvfxab83PYRzaCvvqLz0rFuKh2DEKwA1i5S6jpWYcwdQDisfYb5fiKBuDdATi8p2MJHH9KH1x0U O6k1zmd+kd+PYKoDm8UeRif1olMoUkOADQ5za5cWWBVZz9WMKXdENw9rCbgNHHJx64GCFbpxoZb yd+/3DFVPvOXGy8SRUn2c2x8QjPSqAIsy2c+6U0m4Yxdke47yY6mZGxjGFkCLTX8+UtymmyXfio P5R500C/kMPUgZY0RlhJIouct7JvJgDKdXWIG7QsrM21KIlltRVNHBnlzRUIpimTveHYD1gR/Nu J/XSHyBep04m5eSUVs+u1wM6kRI+q9vAfUnECeOm+aVL5/gLelOhEHZ+vKhyhXrBdWgHG/QQ12v xLxIO3aROocz09OaWOna+xPxselfsdV3cWUVW0DI6BD5ZRuL0wSsglknkDblA8gmJkYIsparFIc dOc9BCElYZS/3jmwKcypdM9tTycYmCsd7RlKgpQ3rwoACFVV4WkUFCUijB+GOSNl5X0ZH+aN+6g G7LS2HXWFQ+fAzNIxA+tRU89/sp28dGPSLN8Brw7UMc5kSEppj8jumxyJYecEaJWzP8xkr18AOn b5AQVCo2ye2t6mQayGcIhetDNPXIirSYpOPbmhzs1nd90KMstruJOOotSkebaSdgDLkvnkw3Fin m4D5p 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. Reviewed-by: Mat Martineau Signed-off-by: Matthieu Baerts (NGI0) --- 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/testing/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() local duration duration=$((stop-start)) - result_msg+=" # time=${duration}ms" printf "(duration %05sms) " "${duration}" if [ ${rets} -ne 0 ] || [ ${retc} -ne 0 ]; then mptcp_lib_pr_fail "client exit code $retc, server $rets" From patchwork Mon Sep 2 11:13:06 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthieu Baerts X-Patchwork-Id: 13787088 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 B9F3D1D54E2; Mon, 2 Sep 2024 11:13:26 +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=1725275606; cv=none; b=nif8a4gvebTjob45NtAb6UnCVKzzeunCq7qQ0GAHsiMVJ9LQE4ieMNArOOSjqfDtGqdQSFFNhF//SgOSoV2W16ZIazHTmf+idwQTa6qRMMLniyreBNtghnApc1y1MSOo2QXanjlPPPa6HaRVJPbrVDS0E80xq1/OJr84pJDA0KA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725275606; c=relaxed/simple; bh=coivBrklEI2JUZwekWv4TknuYZt59LSzSjx3B0A/NVY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Zgml8V+EzeFUQ0iHtCsrAnDCaX+6aBklcdeGKNsrbLmmugI4n6HPzcPgPraJG4FZwuZbziXOGwPS+5/G5MgG3cL3W0j8cykdeZq5ukGGX8RrG/Q+84YQsQ9d63d2/HYfkb6sIb9STDFKeZUERn7WZe7/kgzeY+hviCV1m3tccs8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=tt9U1E/0; 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="tt9U1E/0" Received: by smtp.kernel.org (Postfix) with ESMTPSA id F19ADC4CEC2; Mon, 2 Sep 2024 11:13:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1725275606; bh=coivBrklEI2JUZwekWv4TknuYZt59LSzSjx3B0A/NVY=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=tt9U1E/0P2dARXlbZA+/ZvoPav5Mi+XWYWe+GTgDH4KOAaCMciOGzSuQaxTv1YpXA /lwPWwnc4yJyxna/Sf5zNlEYAb7ctkPUoB3W/Wk6wODvSUrzCe3c/48/Bfw73OP823 21/aI6jqwRQsubNNsxFXcWSxrk9lFN/QI0IBsao3Z9NspPiQSXvn0KarMUWU6Msrxy Yl0ypyYD7PPAYO59yd1TwpA4y+3yvc8j2VSbNAG3dAbbBN2mxzxBT+xB5D5Eppx7EO tW1eaJQPRgfYnGRpKd1rC/KKSdvaLwTSGbP9/r9kkgRjNvecexL1Zoc9m1JtrVCHko avGZNpILYgQKQ== From: "Matthieu Baerts (NGI0)" Date: Mon, 02 Sep 2024 13:13:06 +0200 Subject: [PATCH net-next 3/3] selftests: mptcp: reset the last TS before the first test Precedence: bulk X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20240902-net-next-mptcp-ksft-subtest-time-v1-3-f1ed499a11b1@kernel.org> References: <20240902-net-next-mptcp-ksft-subtest-time-v1-0-f1ed499a11b1@kernel.org> In-Reply-To: <20240902-net-next-mptcp-ksft-subtest-time-v1-0-f1ed499a11b1@kernel.org> To: mptcp@lists.linux.dev, Mat Martineau , Geliang Tang , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Shuah Khan Cc: netdev@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, "Matthieu Baerts (NGI0)" X-Mailer: b4 0.14.1 X-Developer-Signature: v=1; a=openpgp-sha256; l=3916; i=matttbe@kernel.org; h=from:subject:message-id; bh=coivBrklEI2JUZwekWv4TknuYZt59LSzSjx3B0A/NVY=; b=owEBbQKS/ZANAwAIAfa3gk9CaaBzAcsmYgBm1Z3LG1SnxwFVM5q2+pzQSq0NpdMHS6zwszaod Kl8843EtkiJAjMEAAEIAB0WIQToy4X3aHcFem4n93r2t4JPQmmgcwUCZtWdywAKCRD2t4JPQmmg cyErD/0WernVGS/e4FYg55+ajfdTimHSiDpmTWBe7ZeZGoKWXIn1hdehr4wOxDDqKzLhXiQ198v hrxD6kYCbJVfZ+77R6L0wSeZjW14e0a5t3IkOAV2w+gjGBwg7gqgAC7TIiSjuGukO2J0qKRtZxp Qd1cde/uhLKLtoe1YeYss9eGYJJ3Yklx4VML1yQCQCNCrb3wJ8v9wpdWdflBbqvCreL5JtRhqAu kqwknF7WWLtMTylYRUA9pBBYPrszcMXNR7F+AmnLlz1fLtzJ1IaPJYlYn6txQCWcdZS6/IqcqPq UKldJeUTfdQO4qch0DzetHY9an00nb9kqaiAkTnt2Q1+mxQdJmihaAoxzTusbsd6NPiE3UFSkbV mfB6pF+Tw4lh7X9P854dHQv9cTOYuLP2yr7pdbR4/Kcon/d1DEQCoi+x7i9Ee+nlkwgF18fRT9n 9ODWgKgdd4d7puJGBjMU8mkyraHSTr5iDsW3uytFP5ZdJ+CH3KJFeF7FbYf/5XiPeTgaKJYU3Pn GciUD61lwwLK/70k8IWexlPLNdNlzkUH15NjqUv0uAACv/tvcUaDGvX7WcDK0fmluYcLTKe/Wgt UO1Y9lBWOsbRhlILDijVvVhsdJOLILcCQaM13wJY2f9d5IrTmmzIBkmiDP9PbILKFKRRhABRPur /Ej1Fi2hJsLluZA== 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. Reviewed-by: Mat Martineau Signed-off-by: Matthieu Baerts (NGI0) --- 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/testing/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" +mptcp_lib_subtests_last_ts_reset + check_mptcp_disabled stop_if_error "The kernel configuration is not valid for MPTCP" diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testing/selftests/net/mptcp/mptcp_join.sh index a4762c49a878..c31387b74010 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -3883,9 +3883,11 @@ if [ ${#tests[@]} -eq 0 ]; then tests=("${all_tests_names[@]}") fi +mptcp_lib_subtests_last_ts_reset for subtests in "${tests[@]}"; do "${subtests}" done +append_prev_results if [ ${ret} -ne 0 ]; then echo @@ -3896,7 +3898,6 @@ if [ ${ret} -ne 0 ]; then echo fi -append_prev_results mptcp_lib_result_print_all_tap exit $ret diff --git a/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh b/tools/testing/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 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/testing/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 } +mptcp_lib_subtests_last_ts_reset + check "show_endpoints" "" "defaults addr list" default_limits="$(get_limits)" diff --git a/tools/testing/selftests/net/mptcp/simult_flows.sh b/tools/testing/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 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" diff --git a/tools/testing/selftests/net/mptcp/userspace_pm.sh b/tools/testing/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=$(mktemp) mptcp_lib_events "${ns1}" "${server_evts}" server_evts_pid sleep 0.5 +mptcp_lib_subtests_last_ts_reset print_title "Init" print_test "Created network namespaces ns1, ns2"