diff mbox

[dpdk-dev] app/test: Removed file-prefix option in eal_flags and multiprocess unit tests for FreeBSD

Message ID 1416083649-6085-1-git-send-email-pablo.de.lara.guarch@intel.com (mailing list archive)
State Accepted, archived
Headers show

Commit Message

Pablo de Lara Nov. 15, 2014, 8:34 p.m. UTC
eal_flags and multiprocess unit tests use --file-prefix option
which is not supported in FreeBSD, so it has been removed
if compiled for this OS

Signed-off-by: Pablo de Lara <pablo.de.lara.guarch@intel.com>
---
 app/test/test_eal_flags.c    |   16 ++++++++++++----
 app/test/test_mp_secondary.c |   10 ++++++++++
 2 files changed, 22 insertions(+), 4 deletions(-)

Comments

Thomas Monjalon Nov. 24, 2014, 3:53 p.m. UTC | #1
> eal_flags and multiprocess unit tests use --file-prefix option
> which is not supported in FreeBSD, so it has been removed
> if compiled for this OS
> 
> Signed-off-by: Pablo de Lara <pablo.de.lara.guarch@intel.com>

Applied

Thanks
diff mbox

Patch

diff --git a/app/test/test_eal_flags.c b/app/test/test_eal_flags.c
index 1f95d7f..2d7f726 100644
--- a/app/test/test_eal_flags.c
+++ b/app/test/test_eal_flags.c
@@ -400,18 +400,26 @@  test_invalid_b_flag(void)
 static int
 test_invalid_vdev_flag(void)
 {
+#ifdef RTE_EXEC_ENV_BSDAPP
+	/* BSD target doesn't support prefixes at this point, and we also need to
+	 * run another primary process here */
+	const char * prefix = no_shconf;
+#else
+	const char * prefix = "--file-prefix=vdev";
+#endif
+
 	/* Test with invalid vdev option */
-	const char *vdevinval[] = {prgname, "--file-prefix=vdev","-n", "1",
+	const char *vdevinval[] = {prgname, prefix, "-n", "1",
 				"-c", "1", vdev, "eth_dummy"};
 
 	/* Test with valid vdev option */
-	const char *vdevval1[] = {prgname, "--file-prefix=vdev", "-n", "1",
+	const char *vdevval1[] = {prgname, prefix, "-n", "1",
 	"-c", "1", vdev, "eth_ring0"};
 
-	const char *vdevval2[] = {prgname, "--file-prefix=vdev", "-n", "1",
+	const char *vdevval2[] = {prgname, prefix, "-n", "1",
 	"-c", "1", vdev, "eth_ring0,args=test"};
 
-	const char *vdevval3[] = {prgname, "--file-prefix=vdev", "-n", "1",
+	const char *vdevval3[] = {prgname, prefix, "-n", "1",
 	"-c", "1", vdev, "eth_ring0,nodeaction=r1:0:CREATE"};
 
 	if (launch_proc(vdevinval) == 0) {
diff --git a/app/test/test_mp_secondary.c b/app/test/test_mp_secondary.c
index 95a12e2..b5d6802 100644
--- a/app/test/test_mp_secondary.c
+++ b/app/test/test_mp_secondary.c
@@ -84,6 +84,7 @@ 
 #define launch_proc(ARGV) process_dup(ARGV, \
 		sizeof(ARGV)/(sizeof(ARGV[0])), __func__)
 
+#ifdef RTE_EXEC_ENV_LINUXAPP
 static char*
 get_current_prefix(char * prefix, int size)
 {
@@ -107,6 +108,7 @@  get_current_prefix(char * prefix, int size)
 
 	return prefix;
 }
+#endif
 
 /*
  * This function is called in the primary i.e. main test, to spawn off secondary
@@ -118,12 +120,16 @@  run_secondary_instances(void)
 	int ret = 0;
 	char coremask[10];
 
+#ifdef RTE_EXEC_ENV_LINUXAPP
 	char tmp[PATH_MAX] = {0};
 	char prefix[PATH_MAX] = {0};
 
 	get_current_prefix(tmp, sizeof(tmp));
 
 	snprintf(prefix, sizeof(prefix), "--file-prefix=%s", tmp);
+#else
+	const char *prefix = "";
+#endif
 
 	/* good case, using secondary */
 	const char *argv1[] = {
@@ -140,11 +146,13 @@  run_secondary_instances(void)
 			prgname, "-c", coremask, "--proc-type=ERROR",
 			prefix
 	};
+#ifdef RTE_EXEC_ENV_LINUXAPP
 	/* bad case, using invalid file prefix */
 	const char *argv4[]  = {
 			prgname, "-c", coremask, "--proc-type=secondary",
 					"--file-prefix=ERROR"
 	};
+#endif
 
 	snprintf(coremask, sizeof(coremask), "%x", \
 			(1 << rte_get_master_lcore()));
@@ -153,7 +161,9 @@  run_secondary_instances(void)
 	ret |= launch_proc(argv2);
 
 	ret |= !(launch_proc(argv3));
+#ifdef RTE_EXEC_ENV_LINUXAPP
 	ret |= !(launch_proc(argv4));
+#endif
 
 	return ret;
 }