commit 6f1cff733e90fce3554b6aac66cc4f83b60da3d8
author Anas Nashif <anas.nashif@intel.com> Fri Apr 27 08:00:37 2018 +0530
committer Anas Nashif <nashif@linux.intel.com> Fri Apr 27 08:37:29 2018 +0530
tree 3c1e886cae368f33c086a4b8fa36c69a2a052041
parent ae5e11bebc9cd7649c17ebf8f6dc5c8f6eee96ce

ztest: fix result checking

Fixes #7208: failed tests return -1, not 1. Fix this and adjust logic.

Signed-off-by: Anas Nashif <anas.nashif@intel.com>

tests/ztest/src/ztest.c

diff --git a/tests/ztest/src/ztest.c b/tests/ztest/src/ztest.c
index e635ff9..b159ae5 100644
--- a/tests/ztest/src/ztest.c
+++ b/tests/ztest/src/ztest.c
@@ -174,7 +174,7 @@
 
 void ztest_test_skip(void)
 {
-	test_result = 2;
+	test_result = -2;
 	k_sem_give(&test_end_signal);
 	k_thread_abort(k_current_get());
 }
@@ -223,15 +223,17 @@
 	 * phase": this will corrupt the kernel ready queue.
 	 */
 	k_sem_take(&test_end_signal, K_FOREVER);
-	if (test_result == 1) {
+	if (test_result == -1) {
 		ret = TC_FAIL;
-		_TC_END_RESULT(ret, test->name);
 	}
 
-	if (test_result == 2) {
-		_TC_END_RESULT(TC_SKIP, test->name);
-	} else if (!test_result || !FAIL_FAST) {
+	if (!test_result || !FAIL_FAST) {
 		ret |= cleanup_test(test);
+	}
+
+	if (test_result == -2) {
+		_TC_END_RESULT(TC_SKIP, test->name);
+	} else {
 		_TC_END_RESULT(ret, test->name);
 	}