From 6d27d8c0548ea9832f3bc4dc50a9e2ab2e05f00c Mon Sep 17 00:00:00 2001 From: Reshma Pattan Date: Wed, 20 Mar 2019 11:33:19 +0000 Subject: [PATCH] test: fix build without pdump pdump unit test has dependency on pthread code in test.c and process.h to run send_pkts(), this code should be enabled only when CONFIG_RTE_LIBRTE_PDUMP is enabled. Bugzilla ID: 222 Fixes: 086eb64db3 ("test/pdump: add unit test for pdump library") Cc: stable@dpdk.org Signed-off-by: Reshma Pattan Reviewed-by: Rami Rosen --- app/test/process.h | 8 ++++++++ app/test/test.c | 4 ++++ 2 files changed, 12 insertions(+) diff --git a/app/test/process.h b/app/test/process.h index 2701127a2b..513bc9420d 100644 --- a/app/test/process.h +++ b/app/test/process.h @@ -19,9 +19,11 @@ #define exe "exe" #endif +#ifdef RTE_LIBRTE_PDUMP #include extern void *send_pkts(void *empty); extern uint16_t flag_for_send_pkts; +#endif /* * launches a second copy of the test process using the given argv parameters, @@ -36,7 +38,9 @@ process_dup(const char *const argv[], int numargs, const char *env_value) char *argv_cpy[numargs + 1]; int i, fd, status; char path[32]; +#ifdef RTE_LIBRTE_PDUMP pthread_t thread; +#endif pid_t pid = fork(); if (pid < 0) @@ -67,15 +71,19 @@ process_dup(const char *const argv[], int numargs, const char *env_value) rte_panic("Cannot exec\n"); } /* parent process does a wait */ +#ifdef RTE_LIBRTE_PDUMP if ((strcmp(env_value, "run_pdump_server_tests") == 0)) pthread_create(&thread, NULL, &send_pkts, NULL); +#endif while (wait(&status) != pid) ; +#ifdef RTE_LIBRTE_PDUMP if ((strcmp(env_value, "run_pdump_server_tests") == 0)) { flag_for_send_pkts = 0; pthread_join(thread, NULL); } +#endif return status; } diff --git a/app/test/test.c b/app/test/test.c index d646f5160b..1c91ed675c 100644 --- a/app/test/test.c +++ b/app/test/test.c @@ -30,7 +30,9 @@ extern cmdline_parse_ctx_t main_ctx[]; #endif #include "test.h" +#ifdef RTE_LIBRTE_PDUMP #include "test_pdump.h" +#endif #define RTE_LOGTYPE_APP RTE_LOGTYPE_USER1 @@ -50,7 +52,9 @@ do_recursive_call(void) int (*action_fn)(void); } actions[] = { { "run_secondary_instances", test_mp_secondary }, +#ifdef RTE_LIBRTE_PDUMP { "run_pdump_server_tests", test_pdump }, +#endif { "test_missing_c_flag", no_action }, { "test_master_lcore_flag", no_action }, { "test_invalid_n_flag", no_action }, -- 2.20.1