From: Jakub Kicinski <kuba@kernel.org>
To: davem@davemloft.net
Cc: netdev@vger.kernel.org, edumazet@google.com, pabeni@redhat.com,
andrew+netdev@lunn.ch, horms@kernel.org, shuah@kernel.org,
willemb@google.com, petrm@nvidia.com, sdf@fomichev.me,
linux-kselftest@vger.kernel.org, Jakub Kicinski <kuba@kernel.org>
Subject: [PATCH net-next v2 1/2] selftests: drv-net: add path helper for net/lib
Date: Thu, 6 Mar 2025 09:11:57 -0800 [thread overview]
Message-ID: <20250306171158.1836674-1-kuba@kernel.org> (raw)
Looks like a lot of users of recently added env.rpath() actually
want to access stuff under net/lib. Add another helper.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
---
tools/testing/selftests/drivers/net/hds.py | 2 +-
tools/testing/selftests/drivers/net/hw/csum.py | 2 +-
tools/testing/selftests/drivers/net/lib/py/env.py | 7 +++++++
3 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/tools/testing/selftests/drivers/net/hds.py b/tools/testing/selftests/drivers/net/hds.py
index 7cc74faed743..def44c10349a 100755
--- a/tools/testing/selftests/drivers/net/hds.py
+++ b/tools/testing/selftests/drivers/net/hds.py
@@ -20,7 +20,7 @@ from lib.py import defer, ethtool, ip
def _xdp_onoff(cfg):
- prog = cfg.rpath("../../net/lib/xdp_dummy.bpf.o")
+ prog = cfg.lpath("xdp_dummy.bpf.o")
ip("link set dev %s xdp obj %s sec xdp" %
(cfg.ifname, prog))
ip("link set dev %s xdp off" % cfg.ifname)
diff --git a/tools/testing/selftests/drivers/net/hw/csum.py b/tools/testing/selftests/drivers/net/hw/csum.py
index 701aca1361e0..49ec98aef579 100755
--- a/tools/testing/selftests/drivers/net/hw/csum.py
+++ b/tools/testing/selftests/drivers/net/hw/csum.py
@@ -88,7 +88,7 @@ from lib.py import bkg, cmd, wait_port_listen
with NetDrvEpEnv(__file__, nsim_test=False) as cfg:
check_nic_features(cfg)
- cfg.bin_local = cfg.rpath("../../../net/lib/csum")
+ cfg.bin_local = cfg.lpath("csum")
cfg.bin_remote = cfg.remote.deploy(cfg.bin_local)
cases = []
diff --git a/tools/testing/selftests/drivers/net/lib/py/env.py b/tools/testing/selftests/drivers/net/lib/py/env.py
index fd4d674e6c72..2a1f8bd0ec19 100644
--- a/tools/testing/selftests/drivers/net/lib/py/env.py
+++ b/tools/testing/selftests/drivers/net/lib/py/env.py
@@ -30,6 +30,13 @@ from .remote import Remote
src_dir = Path(self.src_path).parent.resolve()
return (src_dir / path).as_posix()
+ def lpath(self, path):
+ """
+ Similar to rpath, but for files in net/lib TARGET.
+ """
+ lib_dir = (Path(__file__).parent / "../../../../net/lib").resolve()
+ return (lib_dir / path).as_posix()
+
def _load_env_file(self):
env = os.environ.copy()
--
2.48.1
next reply other threads:[~2025-03-06 17:12 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-03-06 17:11 Jakub Kicinski [this message]
2025-03-06 17:11 ` [PATCH net-next v2 2/2] selftests: net: use the dummy bpf from net/lib Jakub Kicinski
2025-03-06 19:35 ` Willem de Bruijn
2025-03-06 20:56 ` Jakub Kicinski
2025-03-06 22:20 ` Willem de Bruijn
2025-03-06 22:22 ` [PATCH net-next v2 1/2] selftests: drv-net: add path helper for net/lib Willem de Bruijn
2025-03-07 0:00 ` Jakub Kicinski
2025-03-07 1:31 ` Willem de Bruijn
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250306171158.1836674-1-kuba@kernel.org \
--to=kuba@kernel.org \
--cc=andrew+netdev@lunn.ch \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=horms@kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=petrm@nvidia.com \
--cc=sdf@fomichev.me \
--cc=shuah@kernel.org \
--cc=willemb@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).