patch 'test/cfgfile: fix typo in error messages' has been queued to stable release 21.11.7

Kevin Traynor ktraynor at redhat.com
Thu Apr 4 11:51:49 CEST 2024


Hi,

FYI, your patch has been queued to stable release 21.11.7

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/09/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://github.com/kevintraynor/dpdk-stable

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable/commit/c6ab7f724167b5530314e2607312aa3d056f8b9d

Thanks.

Kevin

---
>From c6ab7f724167b5530314e2607312aa3d056f8b9d Mon Sep 17 00:00:00 2001
From: Holly Nichols <hollynichols04 at gmail.com>
Date: Thu, 21 Mar 2024 19:05:29 -0400
Subject: [PATCH] test/cfgfile: fix typo in error messages

[ upstream commit fbca1ad85f7725b876d032cb732b3332d247e1f4 ]

Caught by codespell.

Fixes: c54e7234bc9e ("test/cfgfile: add basic unit tests")

Signed-off-by: Holly Nichols <hollynichols04 at gmail.com>
Signed-off-by: Vinh Tran <vinh.t.tran10 at gmail.com>
Signed-off-by: Thomas Monjalon <thomas at monjalon.net>
---
 .mailmap                | 2 ++
 app/test/test_cfgfile.c | 8 ++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.mailmap b/.mailmap
index 3851a80bbf..055e44f239 100644
--- a/.mailmap
+++ b/.mailmap
@@ -506,4 +506,5 @@ Hiroki Shirokura <slank.dev at gmail.com>
 Hiroshi Shimamoto <h-shimamoto at ct.jp.nec.com>
 Hiroyuki Mikita <h.mikita89 at gmail.com>
+Holly Nichols <hollynichols04 at gmail.com>
 Hongbo Zheng <zhenghongbo3 at huawei.com>
 Hongjun Ni <hongjun.ni at intel.com>
@@ -1440,4 +1441,5 @@ Vincent Jardin <vincent.jardin at 6wind.com>
 Vincent Li <vincent.mc.li at gmail.com>
 Vincent S. Cojot <vcojot at redhat.com>
+Vinh Tran <vinh.t.tran10 at gmail.com>
 Vipin Varghese <vipin.varghese at amd.com> <vipin.varghese at intel.com>
 Vipul Ashri <vipul.ashri at oracle.com>
diff --git a/app/test/test_cfgfile.c b/app/test/test_cfgfile.c
index 2f596affee..a5e3d8699c 100644
--- a/app/test/test_cfgfile.c
+++ b/app/test/test_cfgfile.c
@@ -169,5 +169,5 @@ test_cfgfile_invalid_section_header(void)
 
 	cfgfile = rte_cfgfile_load(CFG_FILES_ETC "/invalid_section.ini", 0);
-	TEST_ASSERT_NULL(cfgfile, "Expected failured did not occur");
+	TEST_ASSERT_NULL(cfgfile, "Expected failure did not occur");
 
 	return 0;
@@ -186,5 +186,5 @@ test_cfgfile_invalid_comment(void)
 	cfgfile = rte_cfgfile_load_with_params(CFG_FILES_ETC "/sample2.ini", 0,
 					       &params);
-	TEST_ASSERT_NULL(cfgfile, "Expected failured did not occur");
+	TEST_ASSERT_NULL(cfgfile, "Expected failure did not occur");
 
 	return 0;
@@ -197,5 +197,5 @@ test_cfgfile_invalid_key_value_pair(void)
 
 	cfgfile = rte_cfgfile_load(CFG_FILES_ETC "/empty_key_value.ini", 0);
-	TEST_ASSERT_NULL(cfgfile, "Expected failured did not occur");
+	TEST_ASSERT_NULL(cfgfile, "Expected failure did not occur");
 
 	return 0;
@@ -237,5 +237,5 @@ test_cfgfile_missing_section(void)
 
 	cfgfile = rte_cfgfile_load(CFG_FILES_ETC "/missing_section.ini", 0);
-	TEST_ASSERT_NULL(cfgfile, "Expected failured did not occur");
+	TEST_ASSERT_NULL(cfgfile, "Expected failure did not occur");
 
 	return 0;
-- 
2.44.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2024-04-04 10:49:34.483347668 +0100
+++ 0019-test-cfgfile-fix-typo-in-error-messages.patch	2024-04-04 10:49:33.765457777 +0100
@@ -1 +1 @@
-From fbca1ad85f7725b876d032cb732b3332d247e1f4 Mon Sep 17 00:00:00 2001
+From c6ab7f724167b5530314e2607312aa3d056f8b9d Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit fbca1ad85f7725b876d032cb732b3332d247e1f4 ]
+
@@ -9 +10,0 @@
-Cc: stable at dpdk.org
@@ -20 +21 @@
-index 6bb0855236..f3a25a7402 100644
+index 3851a80bbf..055e44f239 100644
@@ -23 +24 @@
-@@ -529,4 +529,5 @@ Hiroki Shirokura <slank.dev at gmail.com>
+@@ -506,4 +506,5 @@ Hiroki Shirokura <slank.dev at gmail.com>
@@ -29 +30 @@
-@@ -1514,4 +1515,5 @@ Vincent Jardin <vincent.jardin at 6wind.com>
+@@ -1440,4 +1441,5 @@ Vincent Jardin <vincent.jardin at 6wind.com>



More information about the stable mailing list