From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 5F1D3A04A2; Mon, 4 Nov 2019 11:07:37 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id EBEDC37A2; Mon, 4 Nov 2019 11:07:36 +0100 (CET) Received: from proxy.6wind.com (host.76.145.23.62.rev.coltfrance.com [62.23.145.76]) by dpdk.org (Postfix) with ESMTP id E250B374C for ; Mon, 4 Nov 2019 11:07:35 +0100 (CET) Received: from glumotte.dev.6wind.com. (unknown [10.16.0.195]) by proxy.6wind.com (Postfix) with ESMTP id A99CB33A476; Mon, 4 Nov 2019 11:07:35 +0100 (CET) From: Olivier Matz To: dev@dpdk.org Cc: Andrew Rybchenko , Pallantla Poornima Date: Mon, 4 Nov 2019 11:06:23 +0100 Message-Id: <20191104100622.13048-1-olivier.matz@6wind.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [PATCH] test/mempool: fix false positive test result X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" The ret variable, initialized to -1, is changed to 0 during the test, making the test successful in some cases where it should return a failure. Fix this by always using the GOTO_ERR() macro that sets the ret variable before doing the goto. Fixes: 923ceaeac140 ("test/mempool: add unit test cases") Cc: Pallantla Poornima Signed-off-by: Olivier Matz --- app/test/test_mempool.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/app/test/test_mempool.c b/app/test/test_mempool.c index 8b20886c8..c32a5d387 100644 --- a/app/test/test_mempool.c +++ b/app/test/test_mempool.c @@ -502,7 +502,7 @@ test_mempool(void) if (mp_nocache == NULL) { printf("cannot allocate mp_nocache mempool\n"); - goto err; + GOTO_ERR(ret, err); } /* create a mempool (with cache) */ @@ -515,7 +515,7 @@ test_mempool(void) if (mp_cache == NULL) { printf("cannot allocate mp_cache mempool\n"); - goto err; + GOTO_ERR(ret, err); } /* create an empty mempool */ @@ -571,15 +571,15 @@ test_mempool(void) if (mp_stack == NULL) { printf("cannot allocate mp_stack mempool\n"); - goto err; + GOTO_ERR(ret, err); } if (rte_mempool_set_ops_byname(mp_stack, "stack", NULL) < 0) { printf("cannot set stack handler\n"); - goto err; + GOTO_ERR(ret, err); } if (rte_mempool_populate_default(mp_stack) < 0) { printf("cannot populate mp_stack mempool\n"); - goto err; + GOTO_ERR(ret, err); } rte_mempool_obj_iter(mp_stack, my_obj_init, NULL); @@ -593,23 +593,23 @@ test_mempool(void) if (default_pool == NULL) { printf("cannot allocate default mempool\n"); - goto err; + GOTO_ERR(ret, err); } if (rte_mempool_set_ops_byname(default_pool, default_pool_ops, NULL) < 0) { printf("cannot set %s handler\n", default_pool_ops); - goto err; + GOTO_ERR(ret, err); } if (rte_mempool_populate_default(default_pool) < 0) { printf("cannot populate %s mempool\n", default_pool_ops); - goto err; + GOTO_ERR(ret, err); } rte_mempool_obj_iter(default_pool, my_obj_init, NULL); /* retrieve the mempool from its name */ if (rte_mempool_lookup("test_nocache") != mp_nocache) { printf("Cannot lookup mempool from its name\n"); - goto err; + GOTO_ERR(ret, err); } printf("Walk into mempools:\n"); @@ -619,36 +619,36 @@ test_mempool(void) /* basic tests without cache */ if (test_mempool_basic(mp_nocache, 0) < 0) - goto err; + GOTO_ERR(ret, err); /* basic tests with cache */ if (test_mempool_basic(mp_cache, 0) < 0) - goto err; + GOTO_ERR(ret, err); /* basic tests with user-owned cache */ if (test_mempool_basic(mp_nocache, 1) < 0) - goto err; + GOTO_ERR(ret, err); /* more basic tests without cache */ if (test_mempool_basic_ex(mp_nocache) < 0) - goto err; + GOTO_ERR(ret, err); /* mempool operation test based on single producer and single comsumer */ if (test_mempool_sp_sc() < 0) - goto err; + GOTO_ERR(ret, err); if (test_mempool_creation_with_exceeded_cache_size() < 0) - goto err; + GOTO_ERR(ret, err); if (test_mempool_same_name_twice_creation() < 0) - goto err; + GOTO_ERR(ret, err); /* test the stack handler */ if (test_mempool_basic(mp_stack, 1) < 0) - goto err; + GOTO_ERR(ret, err); if (test_mempool_basic(default_pool, 1) < 0) - goto err; + GOTO_ERR(ret, err); rte_mempool_list_dump(stdout); -- 2.20.1