app/test: convert all tests to register system

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

diff --git a/app/test/test_eal_flags.c b/app/test/test_eal_flags.c
index ea4a567..2d81764 100644 (file)
--- a/app/test/test_eal_flags.c
+++ b/app/test/test_eal_flags.c
@@ -85,7 +85,7 @@ get_hugepage_path(char * src, int src_len, char * dst, int dst_len)
                return 0;
 
        if (strncmp(tokens[2], "hugetlbfs", sizeof("hugetlbfs")) == 0) {
-               rte_snprintf(dst, dst_len, "%s", tokens[1]);
+               snprintf(dst, dst_len, "%s", tokens[1]);
                return 1;
        }
        return 0;
@@ -114,7 +114,7 @@ process_hugefiles(const char * prefix, enum hugepage_action action)
 
        int fd, lck_result, result = 0;
 
-       const int prefix_len = rte_snprintf(hugefile_prefix,
+       const int prefix_len = snprintf(hugefile_prefix,
                        sizeof(hugefile_prefix), "%smap_", prefix);
        if (prefix_len <= 0 || prefix_len >= (int)sizeof(hugefile_prefix)
                        || prefix_len >= (int)sizeof(dirent->d_name)) {
@@ -160,7 +160,7 @@ process_hugefiles(const char * prefix, enum hugepage_action action)
                                {
                                        char file_path[PATH_MAX] = {0};
 
-                                       rte_snprintf(file_path, sizeof(file_path),
+                                       snprintf(file_path, sizeof(file_path),
                                                "%s/%s", hugedir, dirent->d_name);
 
                                        /* remove file */
@@ -257,18 +257,19 @@ get_current_prefix(char * prefix, int size)
        char buf[PATH_MAX] = {0};
 
        /* get file for config (fd is always 3) */
-       rte_snprintf(path, sizeof(path), "/proc/self/fd/%d", 3);
+       snprintf(path, sizeof(path), "/proc/self/fd/%d", 3);
 
        /* return NULL on error */
        if (readlink(path, buf, sizeof(buf)) == -1)
                return NULL;
 
        /* get the basename */
-       rte_snprintf(buf, sizeof(buf), "%s", basename(buf));
+       snprintf(buf, sizeof(buf), "%s", basename(buf));
 
        /* copy string all the way from second char up to start of _config */
-       rte_snprintf(prefix, size, "%.*s",
-                       strnlen(buf, sizeof(buf)) - sizeof("_config"), &buf[1]);
+       snprintf(prefix, size, "%.*s",
+                       (int)(strnlen(buf, sizeof(buf)) - sizeof("_config")),
+                       &buf[1]);
 
        return prefix;
 }
@@ -291,7 +292,7 @@ test_whitelist_flag(void)
                printf("Error - unable to get current prefix!\n");
                return -1;
        }
-       rte_snprintf(prefix, sizeof(prefix), "--file-prefix=%s", tmp);
+       snprintf(prefix, sizeof(prefix), "--file-prefix=%s", tmp);
 #endif
 
        const char *wlinval[][11] = {
@@ -316,9 +317,6 @@ test_whitelist_flag(void)
        const char *wlval3[] = {prgname, prefix, mp_flag, "-n", "1", "-c", "1",
                        pci_whitelist, "09:0B.3,type=test",
                        pci_whitelist, "08:00.1,type=normal",
-#ifdef CONFIG_RTE_LIBRTE_PMD_RING
-                       vdev, "eth_ring,arg=test",
-#endif
        };
 
        for (i = 0; i < sizeof(wlinval) / sizeof(wlinval[0]); i++) {
@@ -360,7 +358,7 @@ test_invalid_b_flag(void)
                printf("Error - unable to get current prefix!\n");
                return -1;
        }
-       rte_snprintf(prefix, sizeof(prefix), "--file-prefix=%s", tmp);
+       snprintf(prefix, sizeof(prefix), "--file-prefix=%s", tmp);
 #endif
 
        const char *blinval[][9] = {
@@ -390,6 +388,53 @@ test_invalid_b_flag(void)
        return 0;
 }
 
+/*
+ *  Test that the app doesn't run with invalid vdev option.
+ *  Final test ensures it does run with valid options as sanity check
+ */
+#ifdef RTE_LIBRTE_PMD_RING
+static int
+test_invalid_vdev_flag(void)
+{
+       /* Test with invalid vdev option */
+       const char *vdevinval[] = {prgname, "--file-prefix=vdev","-n", "1",
+                               "-c", "1", vdev, "eth_dummy"};
+
+       /* Test with valid vdev option */
+       const char *vdevval1[] = {prgname, "--file-prefix=vdev", "-n", "1",
+       "-c", "1", vdev, "eth_ring0"};
+
+       const char *vdevval2[] = {prgname, "--file-prefix=vdev", "-n", "1",
+       "-c", "1", vdev, "eth_ring0,args=test"};
+
+       const char *vdevval3[] = {prgname, "--file-prefix=vdev", "-n", "1",
+       "-c", "1", vdev, "eth_ring0,nodeaction=r1:0:CREATE"};
+
+       if (launch_proc(vdevinval) == 0) {
+               printf("Error - process did run ok with invalid "
+                       "vdev parameter\n");
+               return -1;
+       }
+
+       if (launch_proc(vdevval1) != 0) {
+               printf("Error - process did not run ok with valid vdev value\n");
+               return -1;
+       }
+
+       if (launch_proc(vdevval2) != 0) {
+               printf("Error - process did not run ok with valid vdev value,"
+                       "with dummy args\n");
+               return -1;
+       }
+
+       if (launch_proc(vdevval3) != 0) {
+               printf("Error - process did not run ok with valid vdev value,"
+                       "with valid args\n");
+               return -1;
+       }
+       return 0;
+}
+#endif
 
 /*
  * Test that the app doesn't run with invalid -r option.
@@ -406,7 +451,7 @@ test_invalid_r_flag(void)
                printf("Error - unable to get current prefix!\n");
                return -1;
        }
-       rte_snprintf(prefix, sizeof(prefix), "--file-prefix=%s", tmp);
+       snprintf(prefix, sizeof(prefix), "--file-prefix=%s", tmp);
 #endif
 
        const char *rinval[][9] = {
@@ -450,7 +495,7 @@ test_missing_c_flag(void)
                printf("Error - unable to get current prefix!\n");
                return -1;
        }
-       rte_snprintf(prefix, sizeof(prefix), "--file-prefix=%s", tmp);
+       snprintf(prefix, sizeof(prefix), "--file-prefix=%s", tmp);
 #endif
 
        /* -c flag but no coremask value */
@@ -493,7 +538,7 @@ test_missing_n_flag(void)
                printf("Error - unable to get current prefix!\n");
                return -1;
        }
-       rte_snprintf(prefix, sizeof(prefix), "--file-prefix=%s", tmp);
+       snprintf(prefix, sizeof(prefix), "--file-prefix=%s", tmp);
 #endif
 
        /* -n flag but no value */
@@ -536,7 +581,7 @@ test_no_hpet_flag(void)
                printf("Error - unable to get current prefix!\n");
                return -1;
        }
-       rte_snprintf(prefix, sizeof(prefix), "--file-prefix=%s", tmp);
+       snprintf(prefix, sizeof(prefix), "--file-prefix=%s", tmp);
 
        /* With --no-hpet */
        const char *argv1[] = {prgname, prefix, mp_flag, no_hpet, "-c", "1", "-n", "2"};
@@ -616,7 +661,7 @@ test_dom0_misc_flags(void)
                printf("Error - unable to get current prefix!\n");
                return -1;
        }
-       rte_snprintf(prefix, sizeof(prefix), "--file-prefix=%s", tmp);
+       snprintf(prefix, sizeof(prefix), "--file-prefix=%s", tmp);
 
        /* check that some general flags don't prevent things from working.
         * All cases, apart from the first, app should run.
@@ -690,7 +735,7 @@ test_misc_flags(void)
                printf("Error - unable to get current prefix!\n");
                return -1;
        }
-       rte_snprintf(prefix, sizeof(prefix), "--file-prefix=%s", tmp);
+       snprintf(prefix, sizeof(prefix), "--file-prefix=%s", tmp);
 
        /*
         * get first valid hugepage path
@@ -991,7 +1036,7 @@ test_memory_flags(void)
                printf("Error - unable to get current prefix!\n");
                return -1;
        }
-       rte_snprintf(prefix, sizeof(prefix), "--file-prefix=%s", tmp);
+       snprintf(prefix, sizeof(prefix), "--file-prefix=%s", tmp);
 #endif
 #ifdef RTE_LIBRTE_XEN_DOM0
        mem_size = "30";
@@ -1052,32 +1097,32 @@ test_memory_flags(void)
                return -1;
        }
 
-       rte_snprintf(invalid_socket_mem, sizeof(invalid_socket_mem), "--socket-mem=");
+       snprintf(invalid_socket_mem, sizeof(invalid_socket_mem), "--socket-mem=");
 
        /* add one extra socket */
        for (i = 0; i < num_sockets + 1; i++) {
-               rte_snprintf(buf, sizeof(buf), "%s2", invalid_socket_mem);
-               rte_snprintf(invalid_socket_mem, sizeof(invalid_socket_mem), "%s", buf);
+               snprintf(buf, sizeof(buf), "%s2", invalid_socket_mem);
+               snprintf(invalid_socket_mem, sizeof(invalid_socket_mem), "%s", buf);
 
                if (num_sockets + 1 - i > 1) {
-                       rte_snprintf(buf, sizeof(buf), "%s,", invalid_socket_mem);
-                       rte_snprintf(invalid_socket_mem, sizeof(invalid_socket_mem), "%s", buf);
+                       snprintf(buf, sizeof(buf), "%s,", invalid_socket_mem);
+                       snprintf(invalid_socket_mem, sizeof(invalid_socket_mem), "%s", buf);
                }
        }
 
        /* construct a valid socket mask with 2 megs on each existing socket */
        char valid_socket_mem[SOCKET_MEM_STRLEN];
 
-       rte_snprintf(valid_socket_mem, sizeof(valid_socket_mem), "--socket-mem=");
+       snprintf(valid_socket_mem, sizeof(valid_socket_mem), "--socket-mem=");
 
        /* add one extra socket */
        for (i = 0; i < num_sockets; i++) {
-               rte_snprintf(buf, sizeof(buf), "%s2", valid_socket_mem);
-               rte_snprintf(valid_socket_mem, sizeof(valid_socket_mem), "%s", buf);
+               snprintf(buf, sizeof(buf), "%s2", valid_socket_mem);
+               snprintf(valid_socket_mem, sizeof(valid_socket_mem), "%s", buf);
 
                if (num_sockets - i > 1) {
-                       rte_snprintf(buf, sizeof(buf), "%s,", valid_socket_mem);
-                       rte_snprintf(valid_socket_mem, sizeof(valid_socket_mem), "%s", buf);
+                       snprintf(buf, sizeof(buf), "%s,", valid_socket_mem);
+                       snprintf(valid_socket_mem, sizeof(valid_socket_mem), "%s", buf);
                }
        }
 
@@ -1159,7 +1204,7 @@ test_memory_flags(void)
        return 0;
 }
 
-int
+static int
 test_eal_flags(void)
 {
        int ret = 0;
@@ -1200,6 +1245,13 @@ test_eal_flags(void)
                return ret;
        }
 
+#ifdef RTE_LIBRTE_PMD_RING
+       ret = test_invalid_vdev_flag();
+       if (ret < 0) {
+               printf("Error in test_invalid_vdev_flag()\n");
+               return ret;
+       }
+#endif
        ret = test_invalid_r_flag();
        if (ret < 0) {
                printf("Error in test_invalid_r_flag()\n");
@@ -1231,15 +1283,9 @@ test_eal_flags(void)
        return ret;
 }
 
-#else
-/* Baremetal version
- * Multiprocess not applicable, so just return 0 always
- */
-int
-test_eal_flags(void)
-{
-       printf("Multi-process not possible for baremetal, cannot test EAL flags\n");
-       return 0;
-}
-
+static struct test_command eal_flags_cmd = {
+       .command = "eal_flags_autotest",
+       .callback = test_eal_flags,
+};
+REGISTER_TEST_COMMAND(eal_flags_cmd);
 #endif