patch 'event/sw: fix log in self test' has been queued to stable release 19.11.14

christian.ehrhardt at canonical.com christian.ehrhardt at canonical.com
Fri Nov 11 12:38:55 CET 2022


Hi,

FYI, your patch has been queued to stable release 19.11.14

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 11/18/22. 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://github.com/cpaelzer/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/cpaelzer/dpdk-stable-queue/commit/7bb8064071a494e087e6970635df1a9285ef60b8

Thanks.

Christian Ehrhardt <christian.ehrhardt at canonical.com>

---
>From 7bb8064071a494e087e6970635df1a9285ef60b8 Mon Sep 17 00:00:00 2001
From: Olivier Matz <olivier.matz at 6wind.com>
Date: Wed, 19 Oct 2022 19:06:46 +0530
Subject: [PATCH] event/sw: fix log in self test

[ upstream commit 05d22d4e061a3ac92cb8f076c5ecaed653d4f640 ]

The log should display the value, not the ID.

Fixes: e21df4b062b5 ("test/eventdev: add SW xstats tests")

Signed-off-by: Olivier Matz <olivier.matz at 6wind.com>
---
 drivers/event/sw/sw_evdev_selftest.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/event/sw/sw_evdev_selftest.c b/drivers/event/sw/sw_evdev_selftest.c
index f89b77ce9e..e290cd4776 100644
--- a/drivers/event/sw/sw_evdev_selftest.c
+++ b/drivers/event/sw/sw_evdev_selftest.c
@@ -1634,8 +1634,8 @@ xstats_id_reset_tests(struct test *t)
 		}
 		if (val != port_expected[i]) {
 			printf("%d: %s value incorrect, expected %"PRIu64
-				" got %d\n", __LINE__, port_names[i],
-				port_expected[i], id);
+				" got %"PRIu64"\n", __LINE__, port_names[i],
+				port_expected[i], val);
 			failed = 1;
 		}
 		/* reset to zero */
-- 
2.38.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-11-11 12:35:06.117096903 +0100
+++ 0038-event-sw-fix-log-in-self-test.patch	2022-11-11 12:35:04.797192195 +0100
@@ -1 +1 @@
-From 05d22d4e061a3ac92cb8f076c5ecaed653d4f640 Mon Sep 17 00:00:00 2001
+From 7bb8064071a494e087e6970635df1a9285ef60b8 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 05d22d4e061a3ac92cb8f076c5ecaed653d4f640 ]
+
@@ -9 +10,0 @@
-Cc: stable at dpdk.org
@@ -13,2 +14,2 @@
- drivers/event/sw/sw_evdev_selftest.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ drivers/event/sw/sw_evdev_selftest.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
@@ -17 +18 @@
-index 9f27d8a189..3aa8d76ca8 100644
+index f89b77ce9e..e290cd4776 100644
@@ -20 +21,2 @@
-@@ -1640,7 +1640,7 @@ xstats_id_reset_tests(struct test *t)
+@@ -1634,8 +1634,8 @@ xstats_id_reset_tests(struct test *t)
+ 		}
@@ -22,4 +24,5 @@
- 			printf("%d: %s value incorrect, expected %" PRIu64
- 			       " got %" PRIu64 "\n",
--			       __LINE__, port_names[i], port_expected[i], id);
-+			       __LINE__, port_names[i], port_expected[i], val);
+ 			printf("%d: %s value incorrect, expected %"PRIu64
+-				" got %d\n", __LINE__, port_names[i],
+-				port_expected[i], id);
++				" got %"PRIu64"\n", __LINE__, port_names[i],
++				port_expected[i], val);


More information about the stable mailing list