X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=test%2Ftest%2Ftest.c;h=44dfe20efe29958e12eb2a38d3fa5c6a5c75b099;hb=2b39bf0f75ab07851f61a298e0280da3d009a9b3;hp=ffe3b9260e71f4ce23024e822336f8c4c1d43535;hpb=e2887d5f5796d648af79a77cda62bff7e8bf4249;p=dpdk.git

diff --git a/test/test/test.c b/test/test/test.c
index ffe3b9260e..44dfe20efe 100644
--- a/test/test/test.c
+++ b/test/test/test.c
@@ -73,6 +73,8 @@ do_recursive_call(void)
 	return -1;
 }
 
+int last_test_result;
+
 int
 main(int argc, char **argv)
 {
@@ -111,6 +113,20 @@ main(int argc, char **argv)
 	if (cl == NULL) {
 		return -1;
 	}
+
+	char *dpdk_test = getenv("DPDK_TEST");
+	if (dpdk_test && strlen(dpdk_test)) {
+		char buf[1024];
+		snprintf(buf, sizeof(buf), "%s\n", dpdk_test);
+		if (cmdline_in(cl, buf, strlen(buf)) < 0) {
+			printf("error on cmdline input\n");
+			return -1;
+		}
+
+		cmdline_stdin_exit(cl);
+		return last_test_result;
+	}
+	/* if no DPDK_TEST env variable, go interactive */
 	cmdline_interact(cl);
 	cmdline_stdin_exit(cl);
 #endif
@@ -133,8 +149,20 @@ unit_test_suite_runner(struct unit_test_suite *suite)
 	}
 
 	if (suite->setup)
-		if (suite->setup() != 0)
+		if (suite->setup() != 0) {
+			/*
+			 * setup failed, so count all enabled tests and mark
+			 * them as failed
+			 */
+			while (suite->unit_test_cases[total].testcase) {
+				if (!suite->unit_test_cases[total].enabled)
+					skipped++;
+				else
+					failed++;
+				total++;
+			}
 			goto suite_summary;
+		}
 
 	printf(" + ------------------------------------------------------- +\n");
 
@@ -202,6 +230,8 @@ suite_summary:
 	printf(" + Tests Failed :      %2d\n", failed);
 	printf(" + ------------------------------------------------------- +\n");
 
+	last_test_result = failed;
+
 	if (failed)
 		return -1;