test/security: add inline inbound IPsec cases

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

diff --git a/app/test/test_cmdline_lib.c b/app/test/test_cmdline_lib.c
index bd72df0..fcd58cb 100644 (file)
--- a/app/test/test_cmdline_lib.c
+++ b/app/test/test_cmdline_lib.c
@@ -8,7 +8,6 @@
 #include <stdarg.h>
 #include <stdlib.h>
 #include <errno.h>
-#include <termios.h>
 #include <ctype.h>
 #include <sys/queue.h>
 
@@ -22,6 +21,12 @@
 
 #include "test_cmdline.h"
 
+#ifndef RTE_EXEC_ENV_WINDOWS
+#define NULL_INPUT "/dev/null"
+#else
+#define NULL_INPUT "NUL"
+#endif
+
 /****************************************************************/
 /* static functions required for some tests */
 static void
@@ -71,28 +76,31 @@ test_cmdline_parse_fns(void)
        if (cmdline_complete(cl, "buffer", &i, NULL, sizeof(dst)) >= 0)
                goto error;
 
+       cmdline_free(cl);
        return 0;
 
 error:
        printf("Error: function accepted null parameter!\n");
+       cmdline_free(cl);
        return -1;
 }
 
 static int
 test_cmdline_rdline_fns(void)
 {
-       struct rdline rdl;
+       struct rdline *rdl;
        rdline_write_char_t *wc = &cmdline_write_char;
        rdline_validate_t *v = &valid_buffer;
        rdline_complete_t *c = &complete_buffer;
 
-       if (rdline_init(NULL, wc, v, c) >= 0)
-               goto error;
-       if (rdline_init(&rdl, NULL, v, c) >= 0)
+       rdl = rdline_new(NULL, v, c, NULL);
+       if (rdl != NULL)
                goto error;
-       if (rdline_init(&rdl, wc, NULL, c) >= 0)
+       rdl = rdline_new(wc, NULL, c, NULL);
+       if (rdl != NULL)
                goto error;
-       if (rdline_init(&rdl, wc, v, NULL) >= 0)
+       rdl = rdline_new(wc, v, NULL, NULL);
+       if (rdl != NULL)
                goto error;
        if (rdline_char_in(NULL, 0) >= 0)
                goto error;
@@ -100,25 +108,30 @@ test_cmdline_rdline_fns(void)
                goto error;
        if (rdline_add_history(NULL, "history") >= 0)
                goto error;
-       if (rdline_add_history(&rdl, NULL) >= 0)
+       if (rdline_add_history(rdl, NULL) >= 0)
                goto error;
        if (rdline_get_history_item(NULL, 0) != NULL)
                goto error;
 
        /* void functions */
+       rdline_get_history_buffer_size(NULL);
+       rdline_get_opaque(NULL);
        rdline_newline(NULL, "prompt");
-       rdline_newline(&rdl, NULL);
+       rdline_newline(rdl, NULL);
        rdline_stop(NULL);
        rdline_quit(NULL);
        rdline_restart(NULL);
        rdline_redisplay(NULL);
        rdline_reset(NULL);
        rdline_clear_history(NULL);
+       rdline_free(NULL);
 
+       rdline_free(rdl);
        return 0;
 
 error:
        printf("Error: function accepted null parameter!\n");
+       rdline_free(rdl);
        return -1;
 }
 
@@ -140,25 +153,36 @@ static int
 test_cmdline_socket_fns(void)
 {
        cmdline_parse_ctx_t ctx;
+       struct cmdline *cl;
 
-       if (cmdline_stdin_new(NULL, "prompt") != NULL)
+       cl = cmdline_stdin_new(NULL, "prompt");
+       if (cl != NULL)
                goto error;
-       if (cmdline_stdin_new(&ctx, NULL) != NULL)
+       cl = cmdline_stdin_new(&ctx, NULL);
+       if (cl != NULL)
                goto error;
-       if (cmdline_file_new(NULL, "prompt", "/dev/null") != NULL)
+       cl = cmdline_file_new(NULL, "prompt", NULL_INPUT);
+       if (cl != NULL)
                goto error;
-       if (cmdline_file_new(&ctx, NULL, "/dev/null") != NULL)
+       cl = cmdline_file_new(&ctx, NULL, NULL_INPUT);
+       if (cl != NULL)
                goto error;
-       if (cmdline_file_new(&ctx, "prompt", NULL) != NULL)
+       cl = cmdline_file_new(&ctx, "prompt", NULL);
+       if (cl != NULL)
                goto error;
-       if (cmdline_file_new(&ctx, "prompt", "-/invalid/~/path") != NULL) {
+       cl = cmdline_file_new(&ctx, "prompt", "-/invalid/~/path");
+       if (cl != NULL) {
                printf("Error: succeeded in opening invalid file for reading!");
+               cmdline_free(cl);
                return -1;
        }
-       if (cmdline_file_new(&ctx, "prompt", "/dev/null") == NULL) {
+       cl = cmdline_file_new(&ctx, "prompt", NULL_INPUT);
+       if (cl == NULL) {
                printf("Error: failed to open /dev/null for reading!");
                return -1;
        }
+       cmdline_free(cl);
+       cl = NULL;
 
        /* void functions */
        cmdline_stdin_exit(NULL);
@@ -166,6 +190,7 @@ test_cmdline_socket_fns(void)
        return 0;
 error:
        printf("Error: function accepted null parameter!\n");
+       cmdline_free(cl);
        return -1;
 }
 
@@ -176,13 +201,14 @@ test_cmdline_fns(void)
        struct cmdline *cl;
 
        memset(&ctx, 0, sizeof(ctx));
-       cl = cmdline_new(&ctx, "test", -1, -1);
-       if (cl == NULL)
+       cl = cmdline_new(NULL, "prompt", 0, 0);
+       if (cl != NULL)
                goto error;
-
-       if (cmdline_new(NULL, "prompt", 0, 0) != NULL)
+       cl = cmdline_new(&ctx, NULL, 0, 0);
+       if (cl != NULL)
                goto error;
-       if (cmdline_new(&ctx, NULL, 0, 0) != NULL)
+       cl = cmdline_new(&ctx, "test", -1, -1);
+       if (cl == NULL)
                goto error;
        if (cmdline_in(NULL, "buffer", CMDLINE_TEST_BUFSIZE) >= 0)
                goto error;
@@ -198,6 +224,7 @@ test_cmdline_fns(void)
        cmdline_interact(NULL);
        cmdline_quit(NULL);
 
+       cmdline_free(cl);
        return 0;
 
 error: