test: fix build without pdump
authorReshma Pattan <reshma.pattan@intel.com>
Wed, 20 Mar 2019 11:33:19 +0000 (11:33 +0000)
committerThomas Monjalon <thomas@monjalon.net>
Wed, 27 Mar 2019 00:09:14 +0000 (01:09 +0100)
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 <reshma.pattan@intel.com>
Reviewed-by: Rami Rosen <ramirose@gmail.com>
app/test/process.h
app/test/test.c

index 2701127..513bc94 100644 (file)
 #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;
 }
 
index d646f51..1c91ed6 100644 (file)
@@ -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 },