X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=app%2Ftest%2Ftest.c;h=e8992f4f613f8948f15d8c3ef2ece928af4ef4c8;hb=ff708facfcbf42f3dcb3c62d82ecd93e7b8c2506;hp=a41e43d790d7e2733a8de76e2413e0e611124576;hpb=0d684a7830883ba4f316ea44cbedbce3a4a7a94d;p=dpdk.git

diff --git a/app/test/test.c b/app/test/test.c
index a41e43d790..e8992f4f61 100644
--- a/app/test/test.c
+++ b/app/test/test.c
@@ -51,7 +51,6 @@ extern cmdline_parse_ctx_t main_ctx[];
 
 #include <rte_memory.h>
 #include <rte_memzone.h>
-#include <rte_tailq.h>
 #include <rte_eal.h>
 #include <rte_cycles.h>
 #include <rte_log.h>
@@ -66,7 +65,6 @@ extern cmdline_parse_ctx_t main_ctx[];
 
 const char *prgname; /* to be set to argv[0] */
 
-#ifndef RTE_EXEC_ENV_BAREMETAL
 static const char *recursive_call; /* used in linuxapp for MP and other tests */
 
 static int
@@ -82,6 +80,7 @@ do_recursive_call(void)
 	} actions[] =  {
 			{ "run_secondary_instances", test_mp_secondary },
 			{ "test_missing_c_flag", no_action },
+			{ "test_master_lcore_flag", no_action },
 			{ "test_missing_n_flag", no_action },
 			{ "test_no_hpet_flag", no_action },
 			{ "test_whitelist_flag", no_action },
@@ -96,7 +95,9 @@ do_recursive_call(void)
 			{ "test_memory_flags", no_action },
 			{ "test_file_prefix", no_action },
 			{ "test_no_huge_flag", no_action },
+#ifdef RTE_LIBRTE_IVSHMEM
 			{ "test_ivshmem", test_ivshmem },
+#endif
 	};
 
 	if (recursive_call == NULL)
@@ -108,7 +109,6 @@ do_recursive_call(void)
 	printf("ERROR - missing action to take for %s\n", recursive_call);
 	return -1;
 }
-#endif
 
 int
 main(int argc, char **argv)
@@ -126,14 +126,15 @@ main(int argc, char **argv)
 	rte_timer_subsystem_init();
 #endif
 
+	if (commands_init() < 0)
+		return -1;
+
 	argv += ret;
 
 	prgname = argv[0];
 
-#ifndef RTE_EXEC_ENV_BAREMETAL
 	if ((recursive_call = getenv(RECURSIVE_ENV_VAR)) != NULL)
 		return do_recursive_call();
-#endif
 
 #ifdef RTE_LIBEAL_USE_HPET
 	if (rte_eal_hpet_init(1) < 0)
@@ -153,3 +154,56 @@ main(int argc, char **argv)
 
 	return 0;
 }
+
+
+int
+unit_test_suite_runner(struct unit_test_suite *suite)
+{
+	int retval, i = 0;
+
+	if (suite->suite_name)
+		printf("Test Suite : %s\n", suite->suite_name);
+
+	if (suite->setup)
+		if (suite->setup() != 0)
+			return -1;
+
+	while (suite->unit_test_cases[i].testcase) {
+		/* Run test case setup */
+		if (suite->unit_test_cases[i].setup) {
+			retval = suite->unit_test_cases[i].setup();
+			if (retval != 0)
+				return retval;
+		}
+
+		/* Run test case */
+		if (suite->unit_test_cases[i].testcase() == 0) {
+			printf("TestCase %2d: %s\n", i,
+					suite->unit_test_cases[i].success_msg ?
+					suite->unit_test_cases[i].success_msg :
+					"passed");
+		}
+		else {
+			printf("TestCase %2d: %s\n", i, suite->unit_test_cases[i].fail_msg ?
+					suite->unit_test_cases[i].fail_msg :
+					"failed");
+			return -1;
+		}
+
+		/* Run test case teardown */
+		if (suite->unit_test_cases[i].teardown) {
+			retval = suite->unit_test_cases[i].teardown();
+			if (retval != 0)
+				return retval;
+		}
+
+		i++;
+	}
+
+	/* Run test suite teardown */
+	if (suite->teardown)
+		if (suite->teardown() != 0)
+			return -1;
+
+	return 0;
+}