| Message ID | 20240510112856.1262901-1-vladimir.oltean@nxp.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | cfc2eefd40f1bc121a41a2acd54458046d77f9ae |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net-next] selftests: net: use upstream mtools | expand |
On Fri, 10 May 2024 14:28:56 +0300 Vladimir Oltean wrote: > Check that the deployed mtools version is 3.0 or above. Note that the > version check breaks compatibility with my fork And Joachim's tree from before the tag, the PR was merged a while back ;) > where I didn't bump the version, but I assume that won't be a problem. Agreed, no point accumulating more bespoke checks. I updated NIPA, next run should have tagged 3.0. Speaking of requirement checks - I run the test on a fresh Fedora install yesterday and it was failing with no indication of why. Then I realized tcpdump wasn't installed :(
On Fri, May 10, 2024 at 07:24:24AM -0700, Jakub Kicinski wrote: > On Fri, 10 May 2024 14:28:56 +0300 Vladimir Oltean wrote: > > Check that the deployed mtools version is 3.0 or above. Note that the > > version check breaks compatibility with my fork > > And Joachim's tree from before the tag, the PR was merged a while back > ;) Yet "git tag --contains <the pull request>" shows "v3.0". I have no other reliable way of determining whether IPv6 is supported. Maybe look at msend -h | grep '\-6'. > > where I didn't bump the version, but I assume that won't be a problem. > > Agreed, no point accumulating more bespoke checks. > I updated NIPA, next run should have tagged 3.0. > > Speaking of requirement checks - I run the test on a fresh Fedora > install yesterday and it was failing with no indication of why. > Then I realized tcpdump wasn't installed :( Huh, for me, "why isn't this running properly?" ends up being answered by the following Kconfig options not being active: CONFIG_IP_ADVANCED_ROUTER=y CONFIG_IP_MULTIPLE_TABLES=y CONFIG_NET_L3_MASTER_DEV=y CONFIG_IPV6=y CONFIG_IPV6_MULTIPLE_TABLES=y CONFIG_NET_VRF=y
Hello: This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <kuba@kernel.org>: On Fri, 10 May 2024 14:28:56 +0300 you wrote: > Joachim kindly merged the IPv6 support in > https://github.com/troglobit/mtools/pull/2, so we can just use his > version now. A few more fixes subsequently came in for IPv6, so even > better. > > Check that the deployed mtools version is 3.0 or above. Note that the > version check breaks compatibility with my fork where I didn't bump the > version, but I assume that won't be a problem. > > [...] Here is the summary with links: - [net-next] selftests: net: use upstream mtools https://git.kernel.org/netdev/net-next/c/cfc2eefd40f1 You are awesome, thank you!
diff --git a/tools/testing/selftests/net/forwarding/lib.sh b/tools/testing/selftests/net/forwarding/lib.sh index 4fe28ab5d8b9..aa925c0954a5 100644 --- a/tools/testing/selftests/net/forwarding/lib.sh +++ b/tools/testing/selftests/net/forwarding/lib.sh @@ -309,6 +309,21 @@ require_command() fi } +# IPv6 support was added in v3.0 +check_mtools_version() +{ + local version="$(msend -v)" + local major + + version=${version##msend version } + major=$(echo $version | cut -d. -f1) + + if [ $major -lt 3 ]; then + echo "SKIP: expected mtools version 3.0, got $version" + exit $ksft_skip + fi +} + if [[ "$REQUIRE_JQ" = "yes" ]]; then require_command jq fi @@ -316,10 +331,10 @@ if [[ "$REQUIRE_MZ" = "yes" ]]; then require_command $MZ fi if [[ "$REQUIRE_MTOOLS" = "yes" ]]; then - # https://github.com/vladimiroltean/mtools/ - # patched for IPv6 support + # https://github.com/troglobit/mtools require_command msend require_command mreceive + check_mtools_version fi ##############################################################################
Joachim kindly merged the IPv6 support in https://github.com/troglobit/mtools/pull/2, so we can just use his version now. A few more fixes subsequently came in for IPv6, so even better. Check that the deployed mtools version is 3.0 or above. Note that the version check breaks compatibility with my fork where I didn't bump the version, but I assume that won't be a problem. Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com> --- tools/testing/selftests/net/forwarding/lib.sh | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-)