From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <dev-bounces@dpdk.org>
Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124])
by inbox.dpdk.org (Postfix) with ESMTP id 7090645B9C;
Tue, 22 Oct 2024 08:14:27 +0200 (CEST)
Received: from mails.dpdk.org (localhost [127.0.0.1])
by mails.dpdk.org (Postfix) with ESMTP id D13BA40693;
Tue, 22 Oct 2024 08:13:52 +0200 (CEST)
Received: from szxga05-in.huawei.com (szxga05-in.huawei.com [45.249.212.191])
by mails.dpdk.org (Postfix) with ESMTP id 7FB63402DF
for <dev@dpdk.org>; Tue, 22 Oct 2024 08:13:45 +0200 (CEST)
Received: from mail.maildlp.com (unknown [172.19.88.214])
by szxga05-in.huawei.com (SkyGuard) with ESMTP id 4XXhfZ5XC9z1jBLf;
Tue, 22 Oct 2024 14:12:22 +0800 (CST)
Received: from dggpeml500024.china.huawei.com (unknown [7.185.36.10])
by mail.maildlp.com (Postfix) with ESMTPS id 4132B1A016C;
Tue, 22 Oct 2024 14:13:44 +0800 (CST)
Received: from localhost.localdomain (10.50.165.33) by
dggpeml500024.china.huawei.com (7.185.36.10) with Microsoft SMTP Server
(version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id
15.1.2507.39; Tue, 22 Oct 2024 14:13:44 +0800
From: Chengwen Feng <fengchengwen@huawei.com>
To: <thomas@monjalon.net>, <ferruh.yigit@amd.com>
CC: <dev@dpdk.org>, <stephen@networkplumber.org>
Subject: [PATCH v3 6/8] app/test: extract parse empty elements testcase for
kvargs
Date: Tue, 22 Oct 2024 06:14:29 +0000
Message-ID: <20241022061431.21925-7-fengchengwen@huawei.com>
X-Mailer: git-send-email 2.17.1
In-Reply-To: <20241022061431.21925-1-fengchengwen@huawei.com>
References: <20231103095325.47843-1-fengchengwen@huawei.com>
<20241022061431.21925-1-fengchengwen@huawei.com>
MIME-Version: 1.0
Content-Type: text/plain
X-Originating-IP: [10.50.165.33]
X-ClientProxiedBy: dggems701-chm.china.huawei.com (10.3.19.178) To
dggpeml500024.china.huawei.com (7.185.36.10)
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
Errors-To: dev-bounces@dpdk.org
Extract parse empty elements test as one stand-alone testcase. And
also fix the kvlist was not released when the branch fails.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
Acked-by: Stephen Hemminger <stephen@networkplumber.org>
---
app/test/test_kvargs.c | 68 ++++++++++++++++++------------------------
1 file changed, 29 insertions(+), 39 deletions(-)
diff --git a/app/test/test_kvargs.c b/app/test/test_kvargs.c
index f8d668f2cc..d1e668ac4a 100644
--- a/app/test/test_kvargs.c
+++ b/app/test/test_kvargs.c
@@ -35,44 +35,6 @@ static int check_handler(const char *key, const char *value,
return 0;
}
-/* test a valid case */
-static int test_valid_kvargs(void)
-{
- struct rte_kvargs *kvlist;
- const char *args;
- const char **valid_keys = NULL;
-
- /* test using empty elements (it is valid) */
- args = "foo=1,,check=value2,,";
- kvlist = rte_kvargs_parse(args, NULL);
- if (kvlist == NULL) {
- printf("rte_kvargs_parse() error\n");
- goto fail;
- }
- if (rte_kvargs_count(kvlist, "foo") != 1) {
- printf("invalid count value for 'foo'\n");
- goto fail;
- }
- if (rte_kvargs_count(kvlist, "check") != 1) {
- printf("invalid count value for 'check'\n");
- goto fail;
- }
- rte_kvargs_free(kvlist);
-
- return 0;
-
- fail:
- printf("while processing <%s>", args);
- if (valid_keys != NULL && *valid_keys != NULL) {
- printf(" using valid_keys=<%s", *valid_keys);
- while (*(++valid_keys) != NULL)
- printf(",%s", *valid_keys);
- printf(">");
- }
- printf("\n");
- return -1;
-}
-
static int
test_basic_token_count(void)
{
@@ -244,6 +206,34 @@ test_parse_list_value(void)
return 0;
}
+static int
+test_parse_empty_elements(void)
+{
+ const char *args = "foo=1,,check=value2,,";
+ struct rte_kvargs *kvlist;
+
+ kvlist = rte_kvargs_parse(args, NULL);
+ if (kvlist == NULL) {
+ printf("rte_kvargs_parse() error\n");
+ return -1;
+ }
+
+ if (rte_kvargs_count(kvlist, "foo") != 1) {
+ printf("invalid count value for 'foo'\n");
+ rte_kvargs_free(kvlist);
+ return -1;
+ }
+
+ if (rte_kvargs_count(kvlist, "check") != 1) {
+ printf("invalid count value for 'check'\n");
+ rte_kvargs_free(kvlist);
+ return -1;
+ }
+
+ rte_kvargs_free(kvlist);
+ return 0;
+}
+
/* test several error cases */
static int test_invalid_kvargs(void)
{
@@ -284,11 +274,11 @@ static struct unit_test_suite kvargs_test_suite = {
.setup = NULL,
.teardown = NULL,
.unit_test_cases = {
- TEST_CASE(test_valid_kvargs),
TEST_CASE(test_basic_token_count),
TEST_CASE(test_parse_without_valid_keys),
TEST_CASE(test_parse_with_valid_keys),
TEST_CASE(test_parse_list_value),
+ TEST_CASE(test_parse_empty_elements),
TEST_CASE(test_invalid_kvargs),
TEST_CASES_END() /**< NULL terminate unit test array */
}
--
2.17.1