The previous implementation of gathering the data of verify output did
not properly gather the correct values. This commit amends the faulty
regex with working ones.
Bugzilla ID: 1945
Fixes: 8ee2df9da125 ("dts: add cryptodev package")
Signed-off-by: Andrew Bailey <[email protected]>
---
dts/api/cryptodev/__init__.py | 1 +
dts/api/cryptodev/types.py | 20 ++++++++------------
2 files changed, 9 insertions(+), 12 deletions(-)
diff --git a/dts/api/cryptodev/__init__.py b/dts/api/cryptodev/__init__.py
index 4e8ce47de1..90b847d1fb 100644
--- a/dts/api/cryptodev/__init__.py
+++ b/dts/api/cryptodev/__init__.py
@@ -132,6 +132,7 @@ def run_app(self, num_vfs: int = 1) ->
list[CryptodevResults]:
case TestType.pmd_cyclecount:
parser = PmdCyclecountResults
case TestType.verify:
+ parser_options |= re.DOTALL
parser = VerifyResults
return [parser.parse(line) for line in re.findall(regex,
result.stdout, parser_options)]
diff --git a/dts/api/cryptodev/types.py b/dts/api/cryptodev/types.py
index df73a86fa4..861d46bf13 100644
--- a/dts/api/cryptodev/types.py
+++ b/dts/api/cryptodev/types.py
@@ -160,26 +160,22 @@ class VerifyResults(CryptodevResults):
"""A parser for verify test output."""
#:
- lcore_id: int =
field(metadata=TextParser.find_int(r"lcore\s+(?:id.*\n\s+)?(\d+)"))
+ lcore_id: int = field(metadata=TextParser.find_int(r"\s*(\d+)"))
#: buffer size ran with app
buffer_size: int = field(
- metadata=TextParser.find_int(r"Buf(?:.*\n\s+(?:\d+\s+))?(?:fer
size:\s+)?(\d+)"),
+ metadata=TextParser.find_int(r"\s*(?:\d+\s+)(\d+)"),
)
#: burst size ran with app
burst_size: int = field(
- metadata=TextParser.find_int(r"Burst(?:.*\n\s+(?:\d+\s+){2})?(?:
size:\s+)?(\d+)"),
+ metadata=TextParser.find_int(r"\s*(?:\d+\s+){2}(\d+)"),
)
#: number of packets enqueued
- enqueued: int =
field(metadata=TextParser.find_int(r"Enqueued.*\n\s+(?:\d+\s+){3}(\d+)"))
+ enqueued: int =
field(metadata=TextParser.find_int(r"\s*(?:\d+\s+){3}(\d+)"))
#: number of packets dequeued
- dequeued: int =
field(metadata=TextParser.find_int(r"Dequeued.*\n\s+(?:\d+\s+){4}(\d+)"))
+ dequeued: int =
field(metadata=TextParser.find_int(r"\s*(?:\d+\s+){4}(\d+)"))
#: number of packets enqueue failed
- failed_enqueued: int = field(
- metadata=TextParser.find_int(r"Failed Enq.*\n\s+(?:\d+\s+){5}(\d+)")
- )
+ failed_enqueued: int =
field(metadata=TextParser.find_int(r"\s*(?:\d+\s+){5}(\d+)"))
#: number of packets dequeue failed
- failed_dequeued: int = field(
- metadata=TextParser.find_int(r"Failed Deq.*\n\s+(?:\d+\s+){6}(\d+)")
- )
+ failed_dequeued: int =
field(metadata=TextParser.find_int(r"\s*(?:\d+\s+){6}(\d+)"))
#: total number of failed operations
- failed_ops: int = field(metadata=TextParser.find_int(r"Failed
Ops.*\n\s+(?:\d+\s+){7}(\d+)"))
+ failed_ops: int =
field(metadata=TextParser.find_int(r"\s*(?:\d+\s+){7}(\d+)"))
--
2.50.1
