diff options
| author |   Christian Ehrhardt <christian.ehrhardt@canonical.com> | 2018-06-18 13:36:41 +0200 |
|---|---|---|
| committer | Christian Ehrhardt <christian.ehrhardt@canonical.com> | 2018-06-19 08:22:47 +0200 |
| commit | e4df4d55df003957fc5afd7440e3d3192d7ce218 (patch) | |
| tree | 4d87da85a727b31f1a76de49f6c4d31cedda71b7 /test/test/test_eal_flags.c | |
| parent | d038355bf358f713efbb182f174e2a8a09042e2b (diff) | |
New upstream version 17.11.3
Change-Id: I2b901aaf362a2b94195665cc890d824b2c3a620e
Signed-off-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>
Diffstat (limited to 'test/test/test_eal_flags.c')
| -rw-r--r-- | test/test/test_eal_flags.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/test/test/test_eal_flags.c b/test/test/test_eal_flags.c index 310109e6..473ea113 100644 --- a/test/test/test_eal_flags.c +++ b/test/test/test_eal_flags.c @@ -61,7 +61,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__) @@ -1166,10 +1166,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; } |