michaelh/zephyr
1
0
Fork 0
Code Releases Activity

ztest: remove init_testing

Browse source 
When KERNEL was not defined (unittest), the call to init_testing was
used to set a longjump target using 'stack_fail'. When triggered,
this was actually causing a segfault, because longjmp is only valid
if going directly up the stack. Since init_testing returned, it was
no longer on the stack. Instead, that logic MUST be inlined.

Signed-off-by: Yuval Peress <peress@google.com>
This commit is contained in:
Yuval Peress 2022-08-09 21:59:53 -06:00 • committed by Carles Cufí
commit cdb961eac6
1 changed files with 10 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

24
subsys/testsuite/ztest/src/ztest_new.c
View file

@ -316,14 +316,6 @@ void ztest_test_pass(void) { longjmp(test_pass, 1); }
void ztest_test_skip(void) { longjmp(test_skip, 1); } void ztest_test_skip(void) { longjmp(test_skip, 1); }
static void init_testing(void)
{
if (setjmp(stack_fail)) {
PRINT("TESTSUITE crashed.");
exit(1);
}
}
static int run_test(struct ztest_suite_node *suite, struct ztest_unit_test *test, void *data) static int run_test(struct ztest_suite_node *suite, struct ztest_unit_test *test, void *data)
{ {
int ret = TC_PASS; int ret = TC_PASS;
@ -425,11 +417,6 @@ void ztest_simple_1cpu_after(void *data)
z_test_1cpu_stop(); z_test_1cpu_stop();
} }
static void init_testing(void)
{
k_object_access_all_grant(&ztest_thread);
}
static void test_cb(void *a, void *b, void *c) static void test_cb(void *a, void *b, void *c)
{ {
struct ztest_suite_node *suite = a; struct ztest_suite_node *suite = a;
@ -580,7 +567,16 @@ static int z_ztest_run_test_suite_ptr(struct ztest_suite_node *suite)
return -1; return -1;
} }
init_testing(); #ifndef KERNEL
if (setjmp(stack_fail)) {
PRINT("TESTSUITE crashed.\n");
test_status = ZTEST_STATUS_CRITICAL_ERROR;
end_report();
exit(1);
}
#else
k_object_access_all_grant(&ztest_thread);
#endif
TC_SUITE_START(suite->name); TC_SUITE_START(suite->name);
test_result = ZTEST_RESULT_PENDING; test_result = ZTEST_RESULT_PENDING;