sleep in control plane thread

[dpdk.git] / app / test / test_cmdline_portlist.c

diff --git a/app/test/test_cmdline_portlist.c b/app/test/test_cmdline_portlist.c
index cfd88e5..fd35421 100644 (file)
--- a/app/test/test_cmdline_portlist.c
+++ b/app/test/test_cmdline_portlist.c
@@ -1,41 +1,13 @@
-/*-
- *   BSD LICENSE
- * 
- *   Copyright(c) 2010-2013 Intel Corporation. All rights reserved.
- *   All rights reserved.
- * 
- *   Redistribution and use in source and binary forms, with or without 
- *   modification, are permitted provided that the following conditions 
- *   are met:
- * 
- *     * Redistributions of source code must retain the above copyright 
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright 
- *       notice, this list of conditions and the following disclaimer in 
- *       the documentation and/or other materials provided with the 
- *       distribution.
- *     * Neither the name of Intel Corporation nor the names of its 
- *       contributors may be used to endorse or promote products derived 
- *       from this software without specific prior written permission.
- * 
- *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
- *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
- *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
- *   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 
- *   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
- *   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
- *   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 
- *   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 
- *   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
- *   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
- *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2010-2014 Intel Corporation
  */
 
 #include <stdio.h>
 #include <string.h>
 #include <inttypes.h>
 
+#include <rte_common.h>
+
 #include <cmdline_parse.h>
 #include <cmdline_parse_portlist.h>
 
@@ -118,16 +90,6 @@ const char * portlist_invalid_strs[] = {
                "0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,2",
 };
 
-#define PORTLIST_VALID_STRS_SIZE \
-       (sizeof(portlist_valid_strs) / sizeof(portlist_valid_strs[0]))
-#define PORTLIST_GARBAGE_STRS_SIZE \
-       (sizeof(portlist_garbage_strs) / sizeof(portlist_garbage_strs[0]))
-#define PORTLIST_INVALID_STRS_SIZE \
-       (sizeof(portlist_invalid_strs) / sizeof(portlist_invalid_strs[0]))
-
-
-
-
 /* test invalid parameters */
 int
 test_parse_portlist_invalid_param(void)
@@ -140,21 +102,22 @@ test_parse_portlist_invalid_param(void)
        memset(&result, 0, sizeof(cmdline_portlist_t));
 
        /* try all null */
-       ret = cmdline_parse_portlist(NULL, NULL, NULL);
+       ret = cmdline_parse_portlist(NULL, NULL, NULL, 0);
        if (ret != -1) {
                printf("Error: parser accepted null parameters!\n");
                return -1;
        }
 
        /* try null buf */
-       ret = cmdline_parse_portlist(NULL, NULL, (void*)&result);
+       ret = cmdline_parse_portlist(NULL, NULL, (void*)&result,
+               sizeof(result));
        if (ret != -1) {
                printf("Error: parser accepted null string!\n");
                return -1;
        }
 
        /* try null result */
-       ret = cmdline_parse_portlist(NULL, portlist_valid_strs[0].str, NULL);
+       ret = cmdline_parse_portlist(NULL, portlist_valid_strs[0].str, NULL, 0);
        if (ret == -1) {
                printf("Error: parser rejected null result!\n");
                return -1;
@@ -165,13 +128,6 @@ test_parse_portlist_invalid_param(void)
 
        /* test help function */
 
-       /* try null buf */
-       ret = cmdline_get_help_portlist(NULL, NULL, sizeof(buf));
-       if (ret != -1) {
-               printf("Error: help function accepted null buffer!\n");
-               return -1;
-       }
-
        /* coverage! */
        ret = cmdline_get_help_portlist(NULL, buf, sizeof(buf));
        if (ret < 0) {
@@ -191,12 +147,12 @@ test_parse_portlist_invalid_data(void)
        cmdline_portlist_t result;
 
        /* test invalid strings */
-       for (i = 0; i < PORTLIST_INVALID_STRS_SIZE; i++) {
+       for (i = 0; i < RTE_DIM(portlist_invalid_strs); i++) {
 
                memset(&result, 0, sizeof(cmdline_portlist_t));
 
                ret = cmdline_parse_portlist(NULL, portlist_invalid_strs[i],
-                               (void*)&result);
+                       (void*)&result, sizeof(result));
                if (ret != -1) {
                        printf("Error: parsing %s succeeded!\n",
                                        portlist_invalid_strs[i]);
@@ -216,12 +172,12 @@ test_parse_portlist_valid(void)
        cmdline_portlist_t result;
 
        /* test full strings */
-       for (i = 0; i < PORTLIST_VALID_STRS_SIZE; i++) {
+       for (i = 0; i < RTE_DIM(portlist_valid_strs); i++) {
 
                memset(&result, 0, sizeof(cmdline_portlist_t));
 
                ret = cmdline_parse_portlist(NULL, portlist_valid_strs[i].str,
-                               (void*)&result);
+                       (void*)&result, sizeof(result));
                if (ret < 0) {
                        printf("Error: parsing %s failed!\n",
                                        portlist_valid_strs[i].str);
@@ -235,12 +191,12 @@ test_parse_portlist_valid(void)
        }
 
        /* test garbage strings */
-       for (i = 0; i < PORTLIST_GARBAGE_STRS_SIZE; i++) {
+       for (i = 0; i < RTE_DIM(portlist_garbage_strs); i++) {
 
                memset(&result, 0, sizeof(cmdline_portlist_t));
 
                ret = cmdline_parse_portlist(NULL, portlist_garbage_strs[i],
-                               (void*)&result);
+                       (void*)&result, sizeof(result));
                if (ret < 0) {
                        printf("Error: parsing %s failed!\n",
                                        portlist_garbage_strs[i]);