test: fix terminal settings on exit
authorStephen Hemminger <stephen@networkplumber.org>
Thu, 14 Jan 2021 16:45:37 +0000 (08:45 -0800)
committerThomas Monjalon <thomas@monjalon.net>
Sun, 17 Jan 2021 17:51:13 +0000 (18:51 +0100)
When running one test (via DPDK_TEST) the test program
would leave the terminal in raw mode.  This was because
it was setting up cmdline to do interactive input.

The fix is to use cmdline_new() for the interactive case.

This also fixes a memory leak because the test
runner was never calling cmdline_free().

Fixes: 9b848774a5dc ("test: use env variable to run tests")
Cc: stable@dpdk.org
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
Tested-by: Harry van Haaren <harry.van.haaren@intel.com>
app/test/test.c

index ba0b030..624dd48 100644 (file)
@@ -164,29 +164,38 @@ main(int argc, char **argv)
 
 
 #ifdef RTE_LIB_CMDLINE
-       cl = cmdline_stdin_new(main_ctx, "RTE>>");
-       if (cl == NULL) {
-               ret = -1;
-               goto out;
-       }
-
        char *dpdk_test = getenv("DPDK_TEST");
        if (dpdk_test && strlen(dpdk_test)) {
                char buf[1024];
+
+               cl = cmdline_new(main_ctx, "RTE>>", 0, 1);
+               if (cl == NULL) {
+                       ret = -1;
+                       goto out;
+               }
+
                snprintf(buf, sizeof(buf), "%s\n", dpdk_test);
                if (cmdline_in(cl, buf, strlen(buf)) < 0) {
                        printf("error on cmdline input\n");
+
+                       ret = -1;
+               } else {
+                       ret = last_test_result;
+               }
+               cmdline_free(cl);
+               goto out;
+       } else {
+               /* if no DPDK_TEST env variable, go interactive */
+               cl = cmdline_stdin_new(main_ctx, "RTE>>");
+               if (cl == NULL) {
                        ret = -1;
                        goto out;
                }
 
+               cmdline_interact(cl);
                cmdline_stdin_exit(cl);
-               ret = last_test_result;
-               goto out;
+               cmdline_free(cl);
        }
-       /* if no DPDK_TEST env variable, go interactive */
-       cmdline_interact(cl);
-       cmdline_stdin_exit(cl);
 #endif
        ret = 0;