Merge branch 'upstream-16.11-stable' into 16.11.x

[deb_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 93ae6e7..15248ea 100644 (file)
--- a/app/test/test_eal_flags.c
+++ b/app/test/test_eal_flags.c
@@ -66,7 +66,7 @@
 #define memtest "memtest"
 #define memtest1 "memtest1"
 #define memtest2 "memtest2"
-#define SOCKET_MEM_STRLEN (RTE_MAX_NUMA_NODES * 10)
+#define SOCKET_MEM_STRLEN (RTE_MAX_NUMA_NODES * 20)
 #define launch_proc(ARGV) process_dup(ARGV, \
                sizeof(ARGV)/(sizeof(ARGV[0])), __func__)
 
@@ -414,13 +414,13 @@ test_invalid_vdev_flag(void)
 
        /* Test with valid vdev option */
        const char *vdevval1[] = {prgname, prefix, "-n", "1",
-       "-c", "1", vdev, "eth_ring0"};
+       "-c", "1", vdev, "net_ring0"};
 
        const char *vdevval2[] = {prgname, prefix, "-n", "1",
-       "-c", "1", vdev, "eth_ring0,args=test"};
+       "-c", "1", vdev, "net_ring0,args=test"};
 
        const char *vdevval3[] = {prgname, prefix, "-n", "1",
-       "-c", "1", vdev, "eth_ring0,nodeaction=r1:0:CREATE"};
+       "-c", "1", vdev, "net_ring0,nodeaction=r1:0:CREATE"};
 
        if (launch_proc(vdevinval) == 0) {
                printf("Error - process did run ok with invalid "
@@ -1241,10 +1241,11 @@ test_memory_flags(void)
 #ifdef RTE_EXEC_ENV_BSDAPP
        int i, num_sockets = 1;
 #else
-       int i, num_sockets = get_number_of_sockets();
+       int i, num_sockets = RTE_MIN(get_number_of_sockets(),
+                       RTE_MAX_NUMA_NODES);
 #endif
 
-       if (num_sockets <= 0 || num_sockets > RTE_MAX_NUMA_NODES) {
+       if (num_sockets <= 0) {
                printf("Error - cannot get number of sockets!\n");
                return -1;
        }
@@ -1441,8 +1442,4 @@ test_eal_flags(void)
        return ret;
 }
 
-static struct test_command eal_flags_cmd = {
-       .command = "eal_flags_autotest",
-       .callback = test_eal_flags,
-};
-REGISTER_TEST_COMMAND(eal_flags_cmd);
+REGISTER_TEST_COMMAND(eal_flags_autotest, test_eal_flags);