test: fix build when pdump config is disabled
PATCH 1/1 test: fix build when pdump config is disabled
pdump unit test has dependency on pthread code
in test.c and process.h to run send_pkts(),
this code should be enabled only whenCONFIG_RTE_LIBRTE_PDUMP is enabled.
Bugzilla ID: 222
--- app/test/process.h | 8 ++++++++ app/test/test.c | 4 ++++ 2 files changed, 12 insertions(+)
app/test/process.h +8 -0
@@ -19,9 +19,11 @@#define exe "exe"#endif +#ifdef RTE_LIBRTE_PDUMP #include <pthread.h> 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; }
app/test/test.c +4 -0
@@ -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 },
Signature · 1 line
2.17.1
pdump unit test has dependency on pthread code
in test.c and process.h to run send_pkts(),
this code should be enabled only whenCONFIG_RTE_LIBRTE_PDUMP is enabled.
Bugzilla ID: 222
+1
Checked when CONFIG_RTE_LIBRTE_PDUMP=n
with latest code from master, build completes succesfully
Thomas Monjalon
Applied20/03/2019 16:17, Rami Rosen:
Quoted 10 lines
pdump unit test has dependency on pthread code
intest.candprocess.hto runsend_pkts(),
this code should be enabled only whenCONFIG_RTE_LIBRTE_PDUMPis enabled.Bugzilla ID: 222
Fixes 086eb64db3 ("test/pdump: add unit test for pdump library")
Quoted 8 lines
Signed-off-by Reshma Pattan <[email protected]>+1
Checked when
CONFIG_RTE_LIBRTE_PDUMP=n
with latest code from master, build completes succesfullyReviewed-by Rami Rosen <[email protected]>
Applied, thanks
Note that such #ifdef will be removed when the "make build system" will be removed from DPDK (far target).