app/testpmd: fix metering and policing command for RFC4115

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

diff --git a/app/test/test_errno.c b/app/test/test_errno.c
index 920a2cf..0db4fbc 100644 (file)
--- a/app/test/test_errno.c
+++ b/app/test/test_errno.c
@@ -18,13 +18,19 @@ test_errno(void)
 {
        const char *rte_retval;
        const char *libc_retval;
-#ifdef RTE_EXEC_ENV_BSDAPP
+
+#ifndef RTE_EXEC_ENV_WINDOWS
+#ifdef RTE_EXEC_ENV_FREEBSD
        /* BSD has a colon in the string, unlike linux */
        const char unknown_code_result[] = "Unknown error: %d";
 #else
        const char unknown_code_result[] = "Unknown error %d";
 #endif
-       char expected_libc_retval[sizeof(unknown_code_result)+3];
+       char expected_libc_retval[sizeof(unknown_code_result) + 3];
+#else
+       /* Windows doesn't return error number for error greater than MAX_errno*/
+       static const char expected_libc_retval[] = "Unknown error";
+#endif
 
        /* use a small selection of standard errors for testing */
        int std_errs[] = {EAGAIN, EBADF, EACCES, EINTR, EINVAL};
@@ -36,7 +42,7 @@ test_errno(void)
        if (rte_errno != 0)
                return -1;
        /* check for standard errors we return the same as libc */
-       for (i = 0; i < sizeof(std_errs)/sizeof(std_errs[0]); i++){
+       for (i = 0; i < RTE_DIM(std_errs); i++) {
                rte_retval = rte_strerror(std_errs[i]);
                libc_retval = strerror(std_errs[i]);
                printf("rte_strerror: '%s', strerror: '%s'\n",
@@ -47,18 +53,20 @@ test_errno(void)
        /* for rte-specific errors ensure we return a different string
         * and that the string for libc is for an unknown error
         */
-       for (i = 0; i < sizeof(rte_errs)/sizeof(rte_errs[0]); i++){
+       for (i = 0; i < RTE_DIM(rte_errs); i++) {
                rte_retval = rte_strerror(rte_errs[i]);
                libc_retval = strerror(rte_errs[i]);
                printf("rte_strerror: '%s', strerror: '%s'\n",
                                rte_retval, libc_retval);
                if (strcmp(rte_retval, libc_retval) == 0)
                        return -1;
+#ifndef RTE_EXEC_ENV_WINDOWS
                /* generate appropriate error string for unknown error number
                 * and then check that this is what we got back. If not, we have
                 * a duplicate error number that conflicts with errno.h */
                snprintf(expected_libc_retval, sizeof(expected_libc_retval),
                                unknown_code_result, rte_errs[i]);
+#endif
                if ((strcmp(expected_libc_retval, libc_retval) != 0) &&
                                (strcmp("", libc_retval) != 0)){
                        printf("Error, duplicate error code %d\n", rte_errs[i]);
@@ -69,8 +77,10 @@ test_errno(void)
        /* ensure that beyond RTE_MAX_ERRNO, we always get an unknown code */
        rte_retval = rte_strerror(RTE_MAX_ERRNO + 1);
        libc_retval = strerror(RTE_MAX_ERRNO + 1);
+#ifndef RTE_EXEC_ENV_WINDOWS
        snprintf(expected_libc_retval, sizeof(expected_libc_retval),
                        unknown_code_result, RTE_MAX_ERRNO + 1);
+#endif
        printf("rte_strerror: '%s', strerror: '%s'\n",
                        rte_retval, libc_retval);
        if ((strcmp(rte_retval, libc_retval) != 0) ||