From e55f55531cf595fb02bd4f7d03b261a68d7d9efa Mon Sep 17 00:00:00 2001 From: Angus Gratton Date: Tue, 17 Jul 2018 15:39:40 +1000 Subject: [PATCH] esp32 tests: TLS test: use same size stack for static & non-static task Use constant instead of magic number of task priorities. --- components/freertos/test/test_thread_local.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/components/freertos/test/test_thread_local.c b/components/freertos/test/test_thread_local.c index 912edf966..b80c960fc 100644 --- a/components/freertos/test/test_thread_local.c +++ b/components/freertos/test/test_thread_local.c @@ -87,7 +87,8 @@ static void task_test_tls(void *arg) TEST_CASE("TLS test", "[freertos]") { - static StackType_t s_stack[2048]; + const size_t stack_size = 3072; + StackType_t s_stack[stack_size]; /* with 8KB test task stack (default) this test still has ~3KB headroom */ StaticTask_t s_task; bool running[2] = {true, true}; #if CONFIG_FREERTOS_UNICORE == 0 @@ -96,9 +97,10 @@ TEST_CASE("TLS test", "[freertos]") int other_core = 0; #endif - xTaskCreatePinnedToCore((TaskFunction_t)&task_test_tls, "task_test_tls", 3072, &running[0], 5, NULL, 0); - xTaskCreateStaticPinnedToCore((TaskFunction_t)&task_test_tls, "task_test_tls", sizeof(s_stack), &running[1], - 5, s_stack, &s_task, other_core); + xTaskCreatePinnedToCore((TaskFunction_t)&task_test_tls, "task_test_tls", stack_size, &running[0], + UNITY_FREERTOS_PRIORITY, NULL, 0); + xTaskCreateStaticPinnedToCore((TaskFunction_t)&task_test_tls, "task_test_tls", stack_size, &running[1], + UNITY_FREERTOS_PRIORITY, s_stack, &s_task, other_core); while (running[0] || running[1]) { vTaskDelay(10); }