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

Xueming Li xuemingl at nvidia.com
Sat Apr 13 14:50:02 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=cf631810bf09ef47221ac6f3981497f20e2621fc

Thanks.

Xueming Li <xuemingl at nvidia.com>

---
>From cf631810bf09ef47221ac6f3981497f20e2621fc 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
Cc: Xueming Li <xuemingl at nvidia.com>

[ 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 9654531a59..6e34fe6566 100644
--- a/.mailmap
+++ b/.mailmap
@@ -523,6 +523,7 @@ Hiral Shah <hshah at marvell.com>
 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>
 Hongzhi Guo <guohongzhi1 at huawei.com>
@@ -1499,6 +1500,7 @@ Vincent Guo <guopengfei160 at 163.com>
 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>
 Visa Hankala <visa at hankala.org>
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
@@ -168,7 +168,7 @@ test_cfgfile_invalid_section_header(void)
 	struct rte_cfgfile *cfgfile;
 
 	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;
 }
@@ -185,7 +185,7 @@ 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;
 }
@@ -196,7 +196,7 @@ test_cfgfile_invalid_key_value_pair(void)
 	struct rte_cfgfile *cfgfile;
 
 	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;
 }
@@ -236,7 +236,7 @@ test_cfgfile_missing_section(void)
 	struct rte_cfgfile *cfgfile;
 
 	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.34.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2024-04-13 20:43:08.752317327 +0800
+++ 0122-test-cfgfile-fix-typo-in-error-messages.patch	2024-04-13 20:43:05.157753723 +0800
@@ -1 +1 @@
-From fbca1ad85f7725b876d032cb732b3332d247e1f4 Mon Sep 17 00:00:00 2001
+From cf631810bf09ef47221ac6f3981497f20e2621fc Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Xueming Li <xuemingl at nvidia.com>
+
+[ upstream commit fbca1ad85f7725b876d032cb732b3332d247e1f4 ]
@@ -9 +11,0 @@
-Cc: stable at dpdk.org
@@ -20 +22 @@
-index 6bb0855236..f3a25a7402 100644
+index 9654531a59..6e34fe6566 100644
@@ -23 +25 @@
-@@ -528,6 +528,7 @@ Hiral Shah <hshah at marvell.com>
+@@ -523,6 +523,7 @@ Hiral Shah <hshah at marvell.com>
@@ -31 +33 @@
-@@ -1513,6 +1514,7 @@ Vincent Guo <guopengfei160 at 163.com>
+@@ -1499,6 +1500,7 @@ Vincent Guo <guopengfei160 at 163.com>


More information about the stable mailing list