From d92e8f6cbeec890ec6d7135f3d3af319ca5c24b9 Mon Sep 17 00:00:00 2001
From: Intel <intel.com>
Date: Mon, 3 Jun 2013 00:00:00 +0000
Subject: [PATCH 1/1] app: add tests on --syslog, --no-shconf and --huge-dir
 flags

Signed-off-by: Intel
---
 app/test/test_debug.c     |  1 +
 app/test/test_eal_flags.c | 93 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 94 insertions(+)

diff --git a/app/test/test_debug.c b/app/test/test_debug.c
index b98239b5d4..2f2c41244d 100644
--- a/app/test/test_debug.c
+++ b/app/test/test_debug.c
@@ -41,6 +41,7 @@
 
 #include <rte_debug.h>
 #include <rte_common.h>
+#include <rte_eal.h>
 
 #include "test.h"
 
diff --git a/app/test/test_eal_flags.c b/app/test/test_eal_flags.c
index ef49bd4445..563f9359fd 100644
--- a/app/test/test_eal_flags.c
+++ b/app/test/test_eal_flags.c
@@ -507,13 +507,51 @@ test_no_huge_flag(void)
 static int
 test_misc_flags(void)
 {
+	FILE * hugedir_handle = NULL;
+	char line[PATH_MAX] = {0};
+	char hugepath[PATH_MAX] = {0};
 	char prefix[PATH_MAX], tmp[PATH_MAX];
+	unsigned i, isempty = 1;
+
 	if (get_current_prefix(tmp, sizeof(tmp)) == NULL) {
 		printf("Error - unable to get current prefix!\n");
 		return -1;
 	}
 	rte_snprintf(prefix, sizeof(prefix), "--file-prefix=%s", tmp);
 
+	/*
+	 * get first valid hugepage path
+	 */
+
+	/* get hugetlbfs mountpoints from /proc/mounts */
+	hugedir_handle = fopen("/proc/mounts", "r");
+
+	if (hugedir_handle == NULL) {
+		printf("Error opening /proc/mounts!\n");
+		return -1;
+	}
+
+	/* read /proc/mounts */
+	while (fgets(line, sizeof(line), hugedir_handle) != NULL) {
+
+		/* find first valid hugepath */
+		if (get_hugepage_path(line, sizeof(line), hugepath, sizeof(hugepath)))
+			break;
+	}
+
+	fclose(hugedir_handle);
+
+	/* check if path is not empty */
+	for (i = 0; i < sizeof(hugepath); i++)
+		if (hugepath[i] != '\0')
+			isempty = 0;
+
+	if (isempty) {
+		printf("No mounted hugepage dir found!\n");
+		return -1;
+	}
+
+
 	/* check that some general flags don't prevent things from working.
 	 * All cases, apart from the first, app should run.
 	 * No futher testing of output done.
@@ -525,6 +563,29 @@ test_misc_flags(void)
 	const char *argv1[] = {prgname, prefix, mp_flag, "-c", "1", "--no-pci"};
 	/* With -v */
 	const char *argv2[] = {prgname, prefix, mp_flag, "-c", "1", "-v"};
+	/* With valid --syslog */
+	const char *argv3[] = {prgname, prefix, mp_flag, "-c", "1",
+			"--syslog", "syslog"};
+	/* With empty --syslog (should fail) */
+	const char *argv4[] = {prgname, prefix, mp_flag, "-c", "1", "--syslog"};
+	/* With invalid --syslog */
+	const char *argv5[] = {prgname, prefix, mp_flag, "-c", "1", "--syslog", "error"};
+	/* With no-sh-conf */
+	const char *argv6[] = {prgname, "-c", "1", "-n", "2", "-m", "2",
+			"--no-shconf", "--file-prefix=noshconf" };
+	/* With --huge-dir */
+	const char *argv7[] = {prgname, "-c", "1", "-n", "2", "-m", "2",
+			"--file-prefix=hugedir", "--huge-dir", hugepath};
+	/* With empty --huge-dir (should fail) */
+	const char *argv8[] = {prgname, "-c", "1", "-n", "2", "-m", "2",
+			"--file-prefix=hugedir", "--huge-dir"};
+	/* With invalid --huge-dir */
+	const char *argv9[] = {prgname, "-c", "1", "-n", "2", "-m", "2",
+			"--file-prefix=hugedir", "--huge-dir", "invalid"};
+	/* Secondary process with invalid --huge-dir (should run as flag has no
+	 * effect on secondary processes) */
+	const char *argv10[] = {prgname, prefix, mp_flag, "-c", "1", "--huge-dir", "invalid"};
+
 
 	if (launch_proc(argv0) == 0) {
 		printf("Error - process ran ok with invalid flag\n");
@@ -538,6 +599,38 @@ test_misc_flags(void)
 		printf("Error - process did not run ok with -v flag\n");
 		return -1;
 	}
+	if (launch_proc(argv3) != 0) {
+		printf("Error - process did not run ok with --syslog flag\n");
+		return -1;
+	}
+	if (launch_proc(argv4) == 0) {
+		printf("Error - process run ok with empty --syslog flag\n");
+		return -1;
+	}
+	if (launch_proc(argv5) == 0) {
+		printf("Error - process run ok with invalid --syslog flag\n");
+		return -1;
+	}
+	if (launch_proc(argv6) != 0) {
+		printf("Error - process did not run ok with --no-shconf flag\n");
+		return -1;
+	}
+	if (launch_proc(argv7) != 0) {
+		printf("Error - process did not run ok with --huge-dir flag\n");
+		return -1;
+	}
+	if (launch_proc(argv8) == 0) {
+		printf("Error - process run ok with empty --huge-dir flag\n");
+		return -1;
+	}
+	if (launch_proc(argv9) == 0) {
+		printf("Error - process run ok with invalid --huge-dir flag\n");
+		return -1;
+	}
+	if (launch_proc(argv10) != 0) {
+		printf("Error - secondary process did not run ok with invalid --huge-dir flag\n");
+		return -1;
+	}
 	return 0;
 }
 
-- 
2.20.1