From 896af46bd1ade6d8d1f452f03c6e08e0965d7ef9 Mon Sep 17 00:00:00 2001 From: Phil Yang Date: Tue, 6 Feb 2018 10:21:38 +0800 Subject: [PATCH] test: fix memory flags test for low NUMA nodes number Since RTE_MAX_NUMA_NODES is configurable, the existing socket number could greater than RTE_MAX_NUMA_NODES. Optimize test case to cover this situation.(i.e RTE_MAX_NUMA_NODES=1) Fixes: 45f1b6e8680a ("app: add new tests on eal flags") Cc: stable@dpdk.org Signed-off-by: Phil Yang --- test/test/test_eal_flags.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/test/test/test_eal_flags.c b/test/test/test_eal_flags.c index 93eb7a4811..f840ca50b3 100644 --- a/test/test/test_eal_flags.c +++ b/test/test/test_eal_flags.c @@ -33,7 +33,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__) @@ -1138,10 +1138,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; } -- 2.20.1