X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=app%2Ftest%2Ftest.c;h=cd7aaf645fa6f3c9df6c7851ef53a9474dcf2a1e;hb=694fd2cb8d10be0deb8bd7d41dee73601f31d415;hp=fbe446440f85f69891c190c18b1646b60ece64ad;hpb=50247fe03fe0476746b1ecdb540d44e24a28cece;p=dpdk.git

diff --git a/app/test/test.c b/app/test/test.c
index fbe446440f..cd7aaf645f 100644
--- a/app/test/test.c
+++ b/app/test/test.c
@@ -67,7 +67,9 @@ do_recursive_call(void)
 			{ "test_memory_flags", no_action },
 			{ "test_file_prefix", no_action },
 			{ "test_no_huge_flag", no_action },
+#ifdef RTE_LIBRTE_TIMER
 			{ "timer_secondary_spawn_wait", test_timer_secondary },
+#endif
 	};
 
 	if (recursive_call == NULL)
@@ -187,6 +189,9 @@ main(int argc, char **argv)
 	ret = 0;
 
 out:
+#ifdef RTE_LIBRTE_TIMER
+	rte_timer_subsystem_finalize();
+#endif
 	rte_eal_cleanup();
 	return ret;
 }
@@ -205,14 +210,16 @@ unit_test_suite_runner(struct unit_test_suite *suite)
 		printf(" + Test Suite : %s\n", suite->suite_name);
 	}
 
-	if (suite->setup)
-		if (suite->setup() != 0) {
+	if (suite->setup) {
+		test_success = suite->setup();
+		if (test_success != 0) {
 			/*
-			 * setup failed, so count all enabled tests and mark
-			 * them as failed
+			 * setup did not pass, so count all enabled tests and
+			 * mark them as failed/skipped
 			 */
 			while (suite->unit_test_cases[total].testcase) {
-				if (!suite->unit_test_cases[total].enabled)
+				if (!suite->unit_test_cases[total].enabled ||
+				    test_success == TEST_SKIPPED)
 					skipped++;
 				else
 					failed++;
@@ -220,6 +227,7 @@ unit_test_suite_runner(struct unit_test_suite *suite)
 			}
 			goto suite_summary;
 		}
+	}
 
 	printf(" + ------------------------------------------------------- +\n");
 
@@ -243,6 +251,8 @@ unit_test_suite_runner(struct unit_test_suite *suite)
 			test_success = suite->unit_test_cases[total].testcase();
 			if (test_success == TEST_SUCCESS)
 				succeeded++;
+			else if (test_success == TEST_SKIPPED)
+				skipped++;
 			else if (test_success == -ENOTSUP)
 				unsupported++;
 			else
@@ -259,6 +269,8 @@ unit_test_suite_runner(struct unit_test_suite *suite)
 
 		if (test_success == TEST_SUCCESS)
 			status = "succeeded";
+		else if (test_success == TEST_SKIPPED)
+			status = "skipped";
 		else if (test_success == -ENOTSUP)
 			status = "unsupported";
 		else
@@ -290,7 +302,8 @@ suite_summary:
 	last_test_result = failed;
 
 	if (failed)
-		return -1;
-
-	return 0;
+		return TEST_FAILED;
+	if (total == skipped)
+		return TEST_SKIPPED;
+	return TEST_SUCCESS;
 }