DPDK patches and discussions
 help / color / mirror / Atom feed
From: Reshma Pattan <reshma.pattan@intel.com>
To: dev@dpdk.org
Cc: rami.rosen@intel.com, stable@dpdk.org,
	Reshma Pattan <reshma.pattan@intel.com>
Subject: [dpdk-dev] [PATCH] test: fix build when pdump config is disabled
Date: Wed, 20 Mar 2019 11:33:19 +0000	[thread overview]
Message-ID: <20190320113319.26134-1-reshma.pattan@intel.com> (raw)

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>
---
 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 2701127a2..513bc9420 100644
--- a/app/test/process.h
+++ b/app/test/process.h
@@ -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;
 }
 
diff --git a/app/test/test.c b/app/test/test.c
index d646f5160..1c91ed675 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.17.1

             reply	other threads:[~2019-03-20 11:33 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-03-20 11:33 Reshma Pattan [this message]
2019-03-20 11:33 ` Reshma Pattan
2019-03-20 15:17 ` Rami Rosen
2019-03-20 15:17   ` Rami Rosen
2019-03-27  0:08   ` [dpdk-dev] [dpdk-stable] " Thomas Monjalon
2019-03-27  0:08     ` Thomas Monjalon

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190320113319.26134-1-reshma.pattan@intel.com \
    --to=reshma.pattan@intel.com \
    --cc=dev@dpdk.org \
    --cc=rami.rosen@intel.com \
    --cc=stable@dpdk.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).