On Mon, 02 Sep 2024 13:13:03 +0200 Matthieu Baerts (NGI0) wrote:
> Patches here add 'time=<N>ms' in the diagnostic data of the TAP output,
> e.g.
>
> ok 1 - pm_netlink: defaults addr list # time=9ms
Looking closer, this:
# ok 3 - mptcp[...] MPTCP # time=7184ms
# ok 4 - mptcp[...] TCP # time=6458ms
Makes NIPA unhappy. The match results for regexps look like this:
(None, '4', ' -', 'mptcp[...] MPTCP', ' # ', 'time=6173ms')
(None, '4', ' -', 'mptcp[...] TC', None, 'P # time=6173ms')
IOW the first one is neat, second one gepooped. The regex really wants
there to be no more than a single space before the #. KTAP definition
doesn't say that description must not have trailing white space.
Best I could come up with is:
diff --git a/contest/remote/vmksft-p.py b/contest/remote/vmksft-p.py
index fe9e87abdb5c..a37245bd5b30 100755
--- a/contest/remote/vmksft-p.py
+++ b/contest/remote/vmksft-p.py
@@ -73,7 +73,7 @@ group3 testV skip
tests = []
nested_tests = False
- result_re = re.compile(r"(not )?ok (\d+)( -)? ([^#]*[^ ])( # )?([^ ].*)?$")
+ result_re = re.compile(r"(not )?ok (\d+)( -)? ([^#]*[^ ])( +# )?([^ ].*)?$")
time_re = re.compile(r"time=(\d+)ms")
for line in full_run.split('\n'):
Thoughts?
