Merge branch 'bugfix/enable_freertos_tests_c2' into 'master'

freertos: re-enable tests disabled for C2

Closes IDF-5140

See merge request espressif/esp-idf!18885
This commit is contained in:
Marius Vikhammer 2022-07-07 14:14:46 +08:00
commit f78d13398e
3 changed files with 1 additions and 7 deletions

View File

@ -894,7 +894,7 @@ UT_S2_SDSPI:
UT_C2: UT_C2:
extends: .unit_test_esp32c2_template extends: .unit_test_esp32c2_template
parallel: 20 parallel: 21
tags: tags:
- ESP32C2_IDF - ESP32C2_IDF
- UT_T1_1 - UT_T1_1

View File

@ -21,8 +21,6 @@ static void timer_callback(TimerHandle_t timer)
printf("Callback timer %p count %p = %d\n", timer, count, *count); printf("Callback timer %p count %p = %d\n", timer, count, *count);
} }
#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32C2)
//IDF-5140
TEST_CASE("Oneshot FreeRTOS timers", "[freertos]") TEST_CASE("Oneshot FreeRTOS timers", "[freertos]")
{ {
volatile int count = 0; volatile int count = 0;
@ -77,7 +75,6 @@ TEST_CASE("Recurring FreeRTOS timers", "[freertos]")
TEST_ASSERT( xTimerDelete(recurring, 1) ); TEST_ASSERT( xTimerDelete(recurring, 1) );
} }
#endif //!TEMPORARY_DISABLED_FOR_TARGETS(ESP32C2)
TEST_CASE("Static timer creation", "[freertos]") TEST_CASE("Static timer creation", "[freertos]")
{ {

View File

@ -22,8 +22,6 @@
volatile static int done; volatile static int done;
volatile static int error; volatile static int error;
#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32C2)
//IDF-5140
static void tskTestRand(void *pvParameters) static void tskTestRand(void *pvParameters)
{ {
int l; int l;
@ -61,4 +59,3 @@ TEST_CASE("Test for per-task non-reentrant tasks", "[freertos]")
} }
TEST_ASSERT(error == 0); TEST_ASSERT(error == 0);
} }
#endif //!TEMPORARY_DISABLED_FOR_TARGETS(ESP32C2)