From patchwork Fri Nov 3 09:53:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: fengchengwen X-Patchwork-Id: 133829 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 614EC43279; Fri, 3 Nov 2023 10:56:46 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7158D42DC0; Fri, 3 Nov 2023 10:56:15 +0100 (CET) Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by mails.dpdk.org (Postfix) with ESMTP id 69EA44067B for ; Fri, 3 Nov 2023 10:56:09 +0100 (CET) Received: from dggpeml100024.china.huawei.com (unknown [172.30.72.54]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4SMGN33jdlzvQcN; Fri, 3 Nov 2023 17:56:03 +0800 (CST) Received: from localhost.localdomain (10.50.165.33) by dggpeml100024.china.huawei.com (7.185.36.115) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.31; Fri, 3 Nov 2023 17:56:05 +0800 From: Chengwen Feng To: , CC: Subject: [PATCH 6/7] app/test: extract parse empty elements testcase for kvargs Date: Fri, 3 Nov 2023 09:53:24 +0000 Message-ID: <20231103095325.47843-7-fengchengwen@huawei.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20231103095325.47843-1-fengchengwen@huawei.com> References: <20231103095325.47843-1-fengchengwen@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.50.165.33] X-ClientProxiedBy: dggems704-chm.china.huawei.com (10.3.19.181) To dggpeml100024.china.huawei.com (7.185.36.115) X-CFilter-Loop: Reflected X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-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 --- 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 f4257c176f..8cd84fcec0 100644 --- a/app/test/test_kvargs.c +++ b/app/test/test_kvargs.c @@ -36,44 +36,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 */ }