tests: event_manager: Fix sys_reboot misuse

`sys_reboot()` function is expected to be non-return function (marked
now explicitly with FUNC_NORETURN attribute). As the OOM event_manger
test case reimplements this function as returning, the compiler
complains with a warning and the code crashed when executing test.

Fix this by implementing the function as truly non-return. Since the
test case is consdered successful when `sys_reboot()` is called, end it
explicitly from there, releasing resources beforehand.

Finally, rework the rest of the test, to be executed directly from the
test thread instead of system workqueue via event manager. The reason
for this, is that after non-returning `sys_reboot()` is called from the
workqueue context, it will remain blocked. When calling `sys_reboot()`
from the test thread, the test suite takes care of aborting the test
thread and starting fresh for the next test case.

Signed-off-by: Robert Lubos <[email protected]>

Author: rlubos

tests/subsys/event_manager/src/main.c

@@ -59,16 +59,13 @@ static void test_subs_order(void)
 	test_start(TEST_SUBSCRIBER_ORDER);
 }
 
-static void test_oom_reset(void)
-{
-	test_start(TEST_OOM_RESET);
-}
-
 static void test_multicontext(void)
 {
 	test_start(TEST_MULTICONTEXT);
 }
 
+void test_oom_reset(void);
+
 void test_main(void)
 {
 	ztest_test_suite(event_manager_tests,

tests/subsys/event_manager/src/modules/test_oom.c

@@ -14,63 +14,39 @@
 #define TEST_EVENTS_CNT 150
 
 static struct data_event *event_tab[TEST_EVENTS_CNT];
-static bool oom_error;
 
 /* Custom reboot handler to check if sys_reboot is called when OOM. */
 void sys_reboot(int type)
 {
-	oom_error = true;
-}
-
-static bool event_handler(const struct event_header *eh)
-{
-	if (is_test_start_event(eh)) {
-		struct test_start_event *st = cast_test_start_event(eh);
-
-		switch (st->test_id) {
-		case TEST_OOM_RESET:
-		{
-			/* Sending large number of events to cause out of memory error. */
-			int i;
+	int i = 0;
 
-			for (i = 0; i < ARRAY_SIZE(event_tab); i++) {
-				event_tab[i] = new_data_event();
-				if (event_tab[i] == NULL) {
-					break;
-				}
-			}
+	/* Freeing memory to enable further testing. */
+	while (event_tab[i] != NULL) {
+		k_free(event_tab[i]);
+		i++;
+	}
 
-			zassert_true(i < ARRAY_SIZE(event_tab),
-				     "No OOM detected, increase TEST_EVENTS_CNT");
-			zassert_true(oom_error, "OOM error not detected");
+	ztest_test_pass();
 
-			/* Freeing memory to enable further testing. */
-			while (i >= 0) {
-				k_free(event_tab[i]);
-				i--;
-			}
+	while (true) {
+		;
+	}
+}
 
-			struct test_end_event *et = new_test_end_event();
+void test_oom_reset(void)
+{
+	/* Sending large number of events to cause out of memory error. */
+	int i;
 
-			zassert_not_null(et, "Failed to allocate event");
-			et->test_id = st->test_id;
-			EVENT_SUBMIT(et);
-			break;
-		}
-		default:
-			/* Ignore other test cases, check if proper test_id. */
-			zassert_true(st->test_id < TEST_CNT,
-				     "test_id out of range");
+	for (i = 0; i < ARRAY_SIZE(event_tab); i++) {
+		event_tab[i] = new_data_event();
+		if (event_tab[i] == NULL) {
 			break;
 		}
-
-		return false;
 	}
 
-	zassert_true(false, "Event unhandled");
-
-	return false;
+	/* This shall only be executed if OOM is not triggered. */
+	zassert_true(i < ARRAY_SIZE(event_tab),
+		     "No OOM detected, increase TEST_EVENTS_CNT");
+	zassert_unreachable("OOM error not detected");
 }
-
-EVENT_LISTENER(MODULE, event_handler);
-EVENT_SUBSCRIBE(MODULE, test_start_event);