A number of test cases spawned off secondary processes and used the "-c", or coremask, EAL option to do so. This option is deprecated, so replace it with "-l" in tests.
Signed-off-by: Bruce Richardson <[email protected]> --- app/test/test_mp_secondary.c | 13 ++++++------- app/test/test_pdump.c | 7 +++---- app/test/test_timer_secondary.c | 6 +++--- 3 files changed, 12 insertions(+), 14 deletions(-) diff --git a/app/test/test_mp_secondary.c b/app/test/test_mp_secondary.c index f3694530a8..2593454b2c 100644 --- a/app/test/test_mp_secondary.c +++ b/app/test/test_mp_secondary.c @@ -66,7 +66,7 @@ static int run_secondary_instances(void) { int ret = 0; - char coremask[10]; + char core_str[10]; #ifdef RTE_EXEC_ENV_LINUX char tmp[PATH_MAX] = {0}; @@ -81,29 +81,28 @@ run_secondary_instances(void) /* good case, using secondary */ const char *argv1[] = { - prgname, "-c", coremask, "--proc-type=secondary", + prgname, "-l", core_str, "--proc-type=secondary", prefix }; /* good case, using auto */ const char *argv2[] = { - prgname, "-c", coremask, "--proc-type=auto", + prgname, "-l", core_str, "--proc-type=auto", prefix }; /* bad case, using invalid type */ const char *argv3[] = { - prgname, "-c", coremask, "--proc-type=ERROR", + prgname, "-l", core_str, "--proc-type=ERROR", prefix }; #ifdef RTE_EXEC_ENV_LINUX /* bad case, using invalid file prefix */ const char *argv4[] = { - prgname, "-c", coremask, "--proc-type=secondary", + prgname, "-l", core_str, "--proc-type=secondary", "--file-prefix=ERROR" }; #endif - snprintf(coremask, sizeof(coremask), "%x", \ - (1 << rte_get_main_lcore())); + snprintf(core_str, sizeof(core_str), "%u", rte_get_main_lcore()); ret |= launch_proc(argv1); printf("### Testing rte_mp_disable() reject:\n"); diff --git a/app/test/test_pdump.c b/app/test/test_pdump.c index 9f7769707e..1d3fe6e2d5 100644 --- a/app/test/test_pdump.c +++ b/app/test/test_pdump.c @@ -173,7 +173,7 @@ int run_pdump_server_tests(void) { int ret = 0; - char coremask[10]; + char core_str[10]; #ifdef RTE_EXEC_ENV_LINUX char tmp[PATH_MAX] = { 0 }; @@ -187,12 +187,11 @@ run_pdump_server_tests(void) /* good case, using secondary */ const char *const argv1[] = { - prgname, "-c", coremask, "--proc-type=secondary", + prgname, "-l", core_str, "--proc-type=secondary", prefix }; - snprintf(coremask, sizeof(coremask), "%x", - (1 << rte_get_main_lcore())); + snprintf(core_str, sizeof(core_str), "%u", rte_get_main_lcore()); ret = test_pdump_init(); ret |= launch_p(argv1); diff --git a/app/test/test_timer_secondary.c b/app/test/test_timer_secondary.c index 4e220559b4..60ce8c7507 100644 --- a/app/test/test_timer_secondary.c +++ b/app/test/test_timer_secondary.c @@ -50,7 +50,7 @@ struct test_info { static int timer_secondary_spawn_wait(unsigned int lcore) { - char coremask[10]; + char core_str[10]; #ifdef RTE_EXEC_ENV_LINUXAPP char tmp[PATH_MAX] = {0}; char prefix[PATH_MAX] = {0}; @@ -63,12 +63,12 @@ timer_secondary_spawn_wait(unsigned int lcore) #endif char const *argv[] = { prgname, - "-c", coremask, + "-l", core_str, "--proc-type=secondary", prefix }; - snprintf(coremask, sizeof(coremask), "%x", (1 << lcore)); + snprintf(core_str, sizeof(core_str), "%u", lcore); return launch_proc(argv); } -- 2.51.0
