From: Mohsin Bashir <mohsin.bashr@gmail.com>
To: netdev@vger.kernel.org
Cc: shuah@kernel.org, davem@davemloft.net, edumazet@google.com,
kuba@kernel.org, pabeni@redhat.com, willemb@google.com,
petrm@nvidia.com, dw@davidwei.uk, przemyslaw.kitszel@intel.com,
linux-kselftest@vger.kernel.org, mohsin.bashr@gmail.com
Subject: [PATCH net-next] selftests: net: py: support verbose printing, display executed commands
Date: Sun, 14 Jul 2024 20:07:23 -0700 [thread overview]
Message-ID: <20240715030723.1768360-1-mohsin.bashr@gmail.com> (raw)
Add verbosity support to show the commands executed while
running tests. Enable verbosity if either an environment
variable 'VERBOSE' is set to a non-zero number or it is defined
in a config file under driver tests as discussed here:
https://github.com/linux-netdev/nipa/wiki/Running-driver-tests.
Signed-off-by: Mohsin Bashir <mohsin.bashr@gmail.com>
---
tools/testing/selftests/drivers/net/lib/py/env.py | 14 +++++++++++++-
tools/testing/selftests/net/lib/py/__init__.py | 7 +++++++
tools/testing/selftests/net/lib/py/utils.py | 14 ++++++++++++++
3 files changed, 34 insertions(+), 1 deletion(-)
diff --git a/tools/testing/selftests/drivers/net/lib/py/env.py b/tools/testing/selftests/drivers/net/lib/py/env.py
index a5e800b8f103..ec53cf59e104 100644
--- a/tools/testing/selftests/drivers/net/lib/py/env.py
+++ b/tools/testing/selftests/drivers/net/lib/py/env.py
@@ -4,7 +4,7 @@ import os
import time
from pathlib import Path
from lib.py import KsftSkipEx, KsftXfailEx
-from lib.py import cmd, ethtool, ip
+from lib.py import cmd, ethtool, ip, verbosity_ctl
from lib.py import NetNS, NetdevSimDev
from .remote import Remote
@@ -42,6 +42,12 @@ class NetDrvEnv:
self.env = _load_env_file(src_path)
+ try:
+ verbosity_ctl(level=int(self.env.get('VERBOSE', 0)))
+ except ValueError as e:
+ print(f'Ignoring \'VERBOSE\'. Unknown value \'{self.env.get("VERBOSE")}\'')
+ verbosity_ctl(level=0)
+
if 'NETIF' in self.env:
self.dev = ip("link show dev " + self.env['NETIF'], json=True)[0]
else:
@@ -92,6 +98,12 @@ class NetDrvEpEnv:
self._ns = None
self._ns_peer = None
+ try:
+ verbosity_ctl(level=int(self.env.get('VERBOSE', 0)))
+ except ValueError as e:
+ print(f'Ignoring \'VERBOSE\'. Unknown value \'{self.env.get("VERBOSE")}\'')
+ verbosity_ctl(level=0)
+
if "NETIF" in self.env:
if nsim_test is True:
raise KsftXfailEx("Test only works on netdevsim")
diff --git a/tools/testing/selftests/net/lib/py/__init__.py b/tools/testing/selftests/net/lib/py/__init__.py
index b6d498d125fe..1541079fadce 100644
--- a/tools/testing/selftests/net/lib/py/__init__.py
+++ b/tools/testing/selftests/net/lib/py/__init__.py
@@ -1,8 +1,15 @@
# SPDX-License-Identifier: GPL-2.0
+import os
from .consts import KSRC
from .ksft import *
from .netns import NetNS
from .nsim import *
from .utils import *
from .ynl import NlError, YnlFamily, EthtoolFamily, NetdevFamily, RtnlFamily
+
+try:
+ verbosity_ctl(level=int(os.environ.get('VERBOSE', 0)))
+except ValueError as e:
+ print(f'Ignoring \'VERBOSE\'. Unknown value \'{os.environ.get("VERBOSE")}\'')
+ verbosity_ctl(level=0)
diff --git a/tools/testing/selftests/net/lib/py/utils.py b/tools/testing/selftests/net/lib/py/utils.py
index 72590c3f90f1..4a59958649be 100644
--- a/tools/testing/selftests/net/lib/py/utils.py
+++ b/tools/testing/selftests/net/lib/py/utils.py
@@ -9,6 +9,18 @@ import subprocess
import time
+def verbosity_ctl(level=None):
+ global VERBOSITY_LEVEL
+ if level is not None:
+ VERBOSITY_LEVEL = level
+ return VERBOSITY_LEVEL
+
+
+def verbose(*objs, **kwargs):
+ if verbosity_ctl() >= 1:
+ print(*objs, **kwargs)
+
+
class CmdExitFailure(Exception):
pass
@@ -22,6 +34,8 @@ class cmd:
self.stderr = None
self.ret = None
+ verbose("#cmd|", comm)
+
self.comm = comm
if host:
self.proc = host.cmd(comm)
--
2.43.0
next reply other threads:[~2024-07-15 3:07 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-07-15 3:07 Mohsin Bashir [this message]
2024-07-15 10:45 ` [PATCH net-next] selftests: net: py: support verbose printing, display executed commands Petr Machata
2024-08-03 2:58 ` Mohsin Bashir
2024-08-05 14:14 ` Petr Machata
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=20240715030723.1768360-1-mohsin.bashr@gmail.com \
--to=mohsin.bashr@gmail.com \
--cc=davem@davemloft.net \
--cc=dw@davidwei.uk \
--cc=edumazet@google.com \
--cc=kuba@kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=petrm@nvidia.com \
--cc=przemyslaw.kitszel@intel.com \
--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).