Merge branch 'test/freertos_gptimer_not_supported' into 'master'

test(freertos): allow freertos tests to compile even when gptimer is not supported

Closes IDF-11554

See merge request espressif/esp-idf!36461

Author: ESP-Marius

components/freertos/test_apps/freertos/kernel/event_groups/test_freertos_eventgroups.c

@@ -185,6 +185,7 @@ TEST_CASE("FreeRTOS Event Groups do not cause priority inversion when higher pri
 
 /*-----------------Test case for event group trace facilities-----------------*/
 #ifdef  CONFIG_FREERTOS_USE_TRACE_FACILITY
+#if SOC_GPTIMER_SUPPORTED
 /*
  * Test event group Trace Facility functions such as
  * xEventGroupClearBitsFromISR(), xEventGroupSetBitsFromISR()
@@ -261,4 +262,5 @@ TEST_CASE("FreeRTOS Event Group ISR", "[freertos]")
     vSemaphoreDelete(done_sem);
     vTaskDelay(10);     //Give time for idle task to clear up deleted tasks
 }
+#endif //SOC_GPTIMER_SUPPORTED
 #endif      //CONFIG_FREERTOS_USE_TRACE_FACILITY

components/freertos/test_apps/freertos/kernel/tasks/test_freertos_task_notify.c

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2022-2024 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2022-2025 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -21,6 +21,8 @@
 #include "unity.h"
 #include "test_utils.h"
 
+#if SOC_GPTIMER_SUPPORTED
+
 #define NO_OF_NOTIFS    4
 #define NO_OF_TASKS     2       //Sender and receiver
 #define MESSAGE         0xFF
@@ -196,9 +198,10 @@ TEST_CASE("Test Task_Notify", "[freertos]")
         TEST_ESP_OK(gptimer_del_timer(gptimers[i]));
     }
 }
+#endif //SOC_GPTIMER_SUPPORTED
 
 /* Test causes asserts, so it cannot be run as a normal unity test case.
-   Test case is ran as a seperate test case in test_task_notify_too_high_index_fails
+   Test case is ran as a separate test case in test_task_notify_too_high_index_fails
  */
 TEST_CASE("Notify too high index fails", "[ignore]")
 {
@@ -207,7 +210,7 @@ TEST_CASE("Notify too high index fails", "[ignore]")
 }
 
 /* Test causes asserts, so it cannot be run as a normal unity test case.
-   Test case is ran as a seperate test case in test_task_notify_wait_too_high_index_fails
+   Test case is ran as a separate test case in test_task_notify_wait_too_high_index_fails
  */
 TEST_CASE("Notify Wait too high index fails", "[ignore]")
 {

components/freertos/test_apps/freertos/kernel/tasks/test_task_delay.c

@@ -13,6 +13,7 @@
 #include "portTestMacro.h"
 
 /* ------------------------------------------------------------------------------------------------------------------ */
+#if SOC_GPTIMER_SUPPORTED
 
 /*
 Test vTaskDelay
@@ -178,3 +179,4 @@ TEST_CASE("Tasks: Test vTaskDelayUntil", "[freertos]")
 }
 
 #endif /* ( INCLUDE_xTaskDelayUntil == 1 ) */
+#endif //SOC_GPTIMER_SUPPORTED

components/freertos/test_apps/freertos/kernel/tasks/test_task_suspend_resume.c

@@ -118,6 +118,8 @@ TEST_CASE("Suspend the current running task", "[freertos]")
     TEST_ASSERT_TRUE(resumed);
 }
 
+#if SOC_GPTIMER_SUPPORTED
+
 static volatile bool timer_isr_fired;
 static gptimer_handle_t gptimer = NULL;
 
@@ -203,3 +205,5 @@ TEST_CASE("Resume task from ISR (other core)", "[freertos]")
     test_resume_task_from_isr(!UNITY_FREERTOS_CPU);
 }
 #endif // CONFIG_FREERTOS_UNICORE
+
+#endif //SOC_GPTIMER_SUPPORTED

components/freertos/test_apps/freertos/kernel/tasks/test_vTaskSuspendAll_xTaskResumeAll.c

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2022-2024 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2022-2025 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -24,6 +24,8 @@ GP timer is used to trigger an interrupt. Test cases will register an interrupt
 interrupt callback. The functions below simply the interrupt registration/trigger/deregistration process.
 */
 
+#if SOC_GPTIMER_SUPPORTED
+
 static gptimer_handle_t gptimer = NULL;
 static bool (*registered_intr_callback)(void *) = NULL;
 
@@ -84,6 +86,8 @@ static void deregister_intr_cb(void)
     TEST_ESP_OK(gptimer_del_timer(gptimer_temp));
 }
 
+#endif //SOC_GPTIMER_SUPPORTED
+
 /* ---------------------------------------------------------------------------------------------------------------------
 Test vTaskSuspendAll() and xTaskResumeAll() basic
 
@@ -265,6 +269,9 @@ Only runs on !CONFIG_FREERTOS_UNICORE
 --------------------------------------------------------------------------------------------------------------------- */
 
 #if !CONFIG_FREERTOS_UNICORE
+
+#if SOC_GPTIMER_SUPPORTED
+
 static volatile int test_unblk_sync;
 static SemaphoreHandle_t test_unblk_done_sem;
 
@@ -394,6 +401,8 @@ TEST_CASE("Test vTaskSuspendAll allows scheduling on other cores", "[freertos]")
     vTaskDelay(10);
 }
 
+#endif //SOC_GPTIMER_SUPPORTED
+
 /* ---------------------------------------------------------------------------------------------------------------------
 Test vTaskSuspendAll doesn't block unpinned tasks from being scheduled on other cores
 
@@ -539,6 +548,8 @@ Test xTaskResumeAll() resumes pended tasks on the current core
 
 #define TEST_PENDED_NUM_BLOCKED_TASKS   4
 
+#if SOC_GPTIMER_SUPPORTED
+
 static bool test_pended_isr(void *arg)
 {
     TaskHandle_t *blkd_tsks = (TaskHandle_t *)arg;
@@ -639,6 +650,8 @@ TEST_CASE("Test xTaskResumeAll resumes pended tasks", "[freertos]")
     vTaskDelay(10);
 }
 
+#endif //SOC_GPTIMER_SUPPORTED
+
 /* ---------------------------------------------------------------------------------------------------------------------
 Test xTaskSuspendAll on both cores pends all tasks and xTaskResumeAll on both cores resumes all tasks
 

components/freertos/test_apps/freertos/pytest_freertos.py

@@ -13,7 +13,7 @@
     # TODO: [ESP32C61] IDF-11146
     pytest.param('smp', marks=[
         pytest.mark.supported_targets,
-        pytest.mark.temp_skip_ci(targets=['esp32p4', 'esp32c5', 'esp32c61'],
+        pytest.mark.temp_skip_ci(targets=['esp32p4', 'esp32c5', 'esp32c61', 'esp32h21'],
                                  reason='test failed/TBD IDF-8113')
     ]),
 ]

components/idf_test/include/esp32h21/.gitkeep

@@ -0,0 +1,9 @@
+/*
+ * SPDX-FileCopyrightText: 2025 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#pragma once
+
+#define IDF_PERFORMANCE_MAX_ESP_TIMER_GET_TIME_PER_CALL                         1900

components/idf_test/include/esp32h21/idf_performance_target.h

@@ -11,7 +11,7 @@ if(CONFIG_IDF_TARGET_ESP32)
     # where PCNT can count the pulses generated by RMT, and RMT is clocked from REF_TICK
     # REF_TICK won't be affected by DFS
     list(APPEND srcs "ref_clock_impl_rmt_pcnt.c")
-else()
+elseif(CONFIG_SOC_GPTIMER_SUPPORTED)
     list(APPEND srcs "ref_clock_impl_timergroup.c")
 endif()