From 0c80ee083183fc34ddde17b2fadb6f9f88c35d6d Mon Sep 17 00:00:00 2001 From: Andy Ross Date: Fri, 18 May 2018 14:12:29 -0700 Subject: [PATCH] tests/kernel: Bump stack sizes for a few tests on qemu_x86 These tests had very small stacks, and the rbtree scheduler on qemu_x86 (which does need a little extra stack room, though not much) is bumping up against the limit. Increase by ~128 bytes in most cases. In the case of the mbox_api test, there are other platforms (which don't use the tree) which are right against the limit already and will fail to link with a larger stack, so bump it for qemu_x86 only. Signed-off-by: Andy Ross --- tests/kernel/mbox/mbox_api/src/test_mbox_api.c | 4 ++++ tests/kernel/sleep/src/main.c | 4 ++-- .../lifecycle/lifecycle_api/src/test_threads_set_priority.c | 2 +- tests/kernel/threads/scheduling/schedule_api/src/test_sched.h | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/tests/kernel/mbox/mbox_api/src/test_mbox_api.c b/tests/kernel/mbox/mbox_api/src/test_mbox_api.c index 64d426f9ab2..0ad25e9600f 100644 --- a/tests/kernel/mbox/mbox_api/src/test_mbox_api.c +++ b/tests/kernel/mbox/mbox_api/src/test_mbox_api.c @@ -7,7 +7,11 @@ #include #define TIMEOUT 100 +#if !defined(CONFIG_BOARD_QEMU_X86) #define STACK_SIZE (512 + CONFIG_TEST_EXTRA_STACKSIZE) +#else +#define STACK_SIZE (640 + CONFIG_TEST_EXTRA_STACKSIZE) +#endif #define MAIL_LEN 64 /**TESTPOINT: init via K_MBOX_DEFINE*/ diff --git a/tests/kernel/sleep/src/main.c b/tests/kernel/sleep/src/main.c index 9b09c71376f..d6560fe41a9 100644 --- a/tests/kernel/sleep/src/main.c +++ b/tests/kernel/sleep/src/main.c @@ -24,9 +24,9 @@ #include #if defined(CONFIG_ASSERT) && defined(CONFIG_DEBUG) -#define THREAD_STACK (384 + CONFIG_TEST_EXTRA_STACKSIZE) +#define THREAD_STACK (512 + CONFIG_TEST_EXTRA_STACKSIZE) #else -#define THREAD_STACK (256 + CONFIG_TEST_EXTRA_STACKSIZE) +#define THREAD_STACK (384 + CONFIG_TEST_EXTRA_STACKSIZE) #endif #define TEST_THREAD_PRIORITY -4 diff --git a/tests/kernel/threads/lifecycle/lifecycle_api/src/test_threads_set_priority.c b/tests/kernel/threads/lifecycle/lifecycle_api/src/test_threads_set_priority.c index 96eba58f02b..f0042e8085d 100644 --- a/tests/kernel/threads/lifecycle/lifecycle_api/src/test_threads_set_priority.c +++ b/tests/kernel/threads/lifecycle/lifecycle_api/src/test_threads_set_priority.c @@ -6,7 +6,7 @@ #include -#define STACK_SIZE (256 + CONFIG_TEST_EXTRA_STACKSIZE) +#define STACK_SIZE (384 + CONFIG_TEST_EXTRA_STACKSIZE) K_THREAD_STACK_EXTERN(tstack); extern struct k_thread tdata; static int thread2_data; diff --git a/tests/kernel/threads/scheduling/schedule_api/src/test_sched.h b/tests/kernel/threads/scheduling/schedule_api/src/test_sched.h index 695481cfdab..10ea8db9d35 100644 --- a/tests/kernel/threads/scheduling/schedule_api/src/test_sched.h +++ b/tests/kernel/threads/scheduling/schedule_api/src/test_sched.h @@ -10,7 +10,7 @@ #include #include -#if defined(CONFIG_RISCV32) +#if defined(CONFIG_RISCV32) || defined(CONFIG_X86) #define STACK_SIZE 512 #else #define STACK_SIZE (256 + CONFIG_TEST_EXTRA_STACKSIZE)