[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <20250306171158.1836674-1-kuba@kernel.org>
Date: Thu, 6 Mar 2025 09:11:57 -0800
From: Jakub Kicinski <kuba@...nel.org>
To: davem@...emloft.net
Cc: netdev@...r.kernel.org,
edumazet@...gle.com,
pabeni@...hat.com,
andrew+netdev@...n.ch,
horms@...nel.org,
shuah@...nel.org,
willemb@...gle.com,
petrm@...dia.com,
sdf@...ichev.me,
linux-kselftest@...r.kernel.org,
Jakub Kicinski <kuba@...nel.org>
Subject: [PATCH net-next v2 1/2] selftests: drv-net: add path helper for net/lib
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@...nel.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
Powered by blists - more mailing lists