patch 'dts: fix smoke tests driver regex' has been queued to stable release 23.11.1

Xueming Li xuemingl at nvidia.com
Sat Apr 13 14:49:11 CEST 2024


Hi,

FYI, your patch has been queued to stable release 23.11.1

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 04/15/24. So please
shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Queued patches are on a temporary branch at:
https://git.dpdk.org/dpdk-stable/log/?h=23.11-staging

This queued commit can be viewed at:
https://git.dpdk.org/dpdk-stable/commit/?h=23.11-staging&id=2f8836901cbbe9221ab2495ef5ee3caf4e76d2b7

Thanks.

Xueming Li <xuemingl at nvidia.com>

---
>From 2f8836901cbbe9221ab2495ef5ee3caf4e76d2b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juraj=20Linke=C5=A1?= <juraj.linkes at pantheon.tech>
Date: Fri, 23 Feb 2024 09:30:01 +0100
Subject: [PATCH] dts: fix smoke tests driver regex
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: Xueming Li <xuemingl at nvidia.com>

[ upstream commit 409359adce43360a77c2675ff0e228da67ae3c96 ]

Add hyphen to the regex, which is needed for drivers such as vfio-pci.

Fixes: 88489c0501af ("dts: add smoke tests")

Signed-off-by: Juraj Linkeš <juraj.linkes at pantheon.tech>
Reviewed-by: Jeremy Spewock <jspewock at iol.unh.edu>
Tested-by: Nicholas Pratte <npratte at iol.unh.edu>
---
 .mailmap                           | 1 +
 dts/tests/TestSuite_smoke_tests.py | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.mailmap b/.mailmap
index daa1f52205..f76fef1c48 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1013,6 +1013,7 @@ Nemanja Marjanovic <nemanja.marjanovic at intel.com>
 Netanel Belgazal <netanel at amazon.com>
 Netanel Gonen <netanelg at mellanox.com>
 Niall Power <niall.power at intel.com>
+Nicholas Pratte <npratte at iol.unh.edu>
 Nick Connolly <nick.connolly at mayadata.io>
 Nick Nunley <nicholas.d.nunley at intel.com>
 Niclas Storm <niclas.storm at ericsson.com>
diff --git a/dts/tests/TestSuite_smoke_tests.py b/dts/tests/TestSuite_smoke_tests.py
index 8958f58dac..5e897cf5d2 100644
--- a/dts/tests/TestSuite_smoke_tests.py
+++ b/dts/tests/TestSuite_smoke_tests.py
@@ -91,7 +91,7 @@ class SmokeTests(TestSuite):
             # with the address for the nic we are on in the loop and then captures the
             # name of the driver in a group
             devbind_info_for_nic = re.search(
-                f"{nic.pci}[^\\n]*drv=([\\d\\w]*) [^\\n]*",
+                f"{nic.pci}[^\\n]*drv=([\\d\\w-]*) [^\\n]*",
                 all_nics_in_dpdk_devbind,
             )
             self.verify(
-- 
2.34.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2024-04-13 20:43:07.204000550 +0800
+++ 0071-dts-fix-smoke-tests-driver-regex.patch	2024-04-13 20:43:05.017753905 +0800
@@ -1 +1 @@
-From 409359adce43360a77c2675ff0e228da67ae3c96 Mon Sep 17 00:00:00 2001
+From 2f8836901cbbe9221ab2495ef5ee3caf4e76d2b7 Mon Sep 17 00:00:00 2001
@@ -7,0 +8,3 @@
+Cc: Xueming Li <xuemingl at nvidia.com>
+
+[ upstream commit 409359adce43360a77c2675ff0e228da67ae3c96 ]
@@ -12 +14,0 @@
-Cc: stable at dpdk.org
@@ -23 +25 @@
-index 55913d0450..68b4cae8d3 100644
+index daa1f52205..f76fef1c48 100644
@@ -26 +28 @@
-@@ -1020,6 +1020,7 @@ Nemanja Marjanovic <nemanja.marjanovic at intel.com>
+@@ -1013,6 +1013,7 @@ Nemanja Marjanovic <nemanja.marjanovic at intel.com>
@@ -35 +37 @@
-index 5e2bac14bd..1be5c3047e 100644
+index 8958f58dac..5e897cf5d2 100644
@@ -38 +40 @@
-@@ -130,7 +130,7 @@ class SmokeTests(TestSuite):
+@@ -91,7 +91,7 @@ class SmokeTests(TestSuite):


More information about the stable mailing list