Browse Source

Merge branch 'bugfix/s3_rtc_ram_deepsleep_test' into 'master'

ci: fix "can set sleep wake stub from stack in RTC RAM" test case failure

Closes IDFCI-137

See merge request espressif/esp-idf!16116
Marius Vikhammer 4 năm trước cách đây
mục cha
commit
93afdea821
1 tập tin đã thay đổi với 5 bổ sung4 xóa
  1. 5 4
      components/esp_system/test/test_sleep.c

+ 5 - 4
components/esp_system/test/test_sleep.c

@@ -324,11 +324,12 @@ static void prepare_wake_stub_from_rtc(void)
        a memory capability (as it's an implementation detail). So to test this we need to allocate
        the stack statically.
     */
+   #define STACK_SIZE 1500
 #if CONFIG_IDF_TARGET_ESP32S3
-    uint8_t *sleep_stack = (uint8_t *)heap_caps_malloc(1024, MALLOC_CAP_RTCRAM);
+    uint8_t *sleep_stack = (uint8_t *)heap_caps_malloc(STACK_SIZE, MALLOC_CAP_RTCRAM);
     TEST_ASSERT((uint32_t)sleep_stack >= SOC_RTC_DRAM_LOW && (uint32_t)sleep_stack < SOC_RTC_DRAM_HIGH);
 #else
-    static RTC_FAST_ATTR uint8_t sleep_stack[1024];
+    static RTC_FAST_ATTR uint8_t sleep_stack[STACK_SIZE];
 #endif
     static RTC_FAST_ATTR StaticTask_t sleep_task;
 
@@ -336,7 +337,7 @@ static void prepare_wake_stub_from_rtc(void)
      * wake from deep sleep. So to ensure unused stack is different if test is re-run without a full reset,
      * fill with some random bytes
      */
-    esp_fill_random(sleep_stack, sizeof(sleep_stack));
+    esp_fill_random(sleep_stack, STACK_SIZE);
 
     /* to make things extra sure, start a periodic timer to write to RTC FAST RAM at high frequency */
     const esp_timer_create_args_t timer_args = {
@@ -350,7 +351,7 @@ static void prepare_wake_stub_from_rtc(void)
     ESP_ERROR_CHECK( esp_timer_start_periodic(timer, 200) );
 
     printf("Creating test task with stack %p\n", sleep_stack);
-    TEST_ASSERT_NOT_NULL(xTaskCreateStatic( (void *)prepare_wake_stub, "sleep", sizeof(sleep_stack), NULL,
+    TEST_ASSERT_NOT_NULL(xTaskCreateStatic( (void *)prepare_wake_stub, "sleep", STACK_SIZE, NULL,
                                             UNITY_FREERTOS_PRIORITY, sleep_stack, &sleep_task));
     vTaskDelay(1000 / portTICK_PERIOD_MS);
     TEST_FAIL_MESSAGE("Should be asleep by now");