Bladeren bron

Merge branch 'feature/re-enable-newlib-test-c2' into 'master'

newlib: Remove tests using RTC related features from the esp32c2 test set

Closes IDF-5057

See merge request espressif/esp-idf!21858
Guillaume Souchere 3 jaren geleden
bovenliggende
commit
8fe13d53b1
2 gewijzigde bestanden met toevoegingen van 4 en 3 verwijderingen
  1. 0 3
      components/newlib/test/test_time.c
  2. 4 0
      tools/unit-test-app/configs/default_2_c2

+ 0 - 3
components/newlib/test/test_time.c

@@ -543,8 +543,6 @@ TEST_CASE("test time functions wide 64 bits", "[newlib]")
 #endif // !_USE_LONG_TIME_T
 
 #if defined( CONFIG_ESP_TIME_FUNCS_USE_ESP_TIMER ) && defined( CONFIG_ESP_TIME_FUNCS_USE_RTC_TIMER )
-#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32C2)
-//IDF-5057
 
 extern int64_t s_microseconds_offset;
 static const uint64_t s_start_timestamp  = 1606838354;
@@ -643,5 +641,4 @@ static void check_time(void)
 TEST_CASE_MULTIPLE_STAGES("Timestamp after abort is correct in case RTC & High-res timer have + big error", "[newlib][reset=abort,SW_CPU_RESET]", set_timestamp1, check_time);
 TEST_CASE_MULTIPLE_STAGES("Timestamp after restart is correct in case RTC & High-res timer have + big error", "[newlib][reset=SW_CPU_RESET]", set_timestamp2, check_time);
 TEST_CASE_MULTIPLE_STAGES("Timestamp after restart is correct in case RTC & High-res timer have - big error", "[newlib][reset=SW_CPU_RESET]", set_timestamp3, check_time);
-#endif //!TEMPORARY_DISABLED_FOR_TARGETS(ESP32C2)
 #endif // CONFIG_ESP_TIME_FUNCS_USE_ESP_TIMER && CONFIG_ESP_TIME_FUNCS_USE_RTC_TIMER

+ 4 - 0
tools/unit-test-app/configs/default_2_c2

@@ -1,3 +1,7 @@
 # This config is split between targets since different component needs to be included
 CONFIG_IDF_TARGET="esp32c2"
 TEST_COMPONENTS=app_trace esp_eth esp_hid esp_netif esp_phy esp_wifi espcoredump hal lwip mdns mqtt newlib nvs_flash partition_table sdmmc
+CONFIG_NEWLIB_TIME_SYSCALL_USE_NONE=n
+CONFIG_NEWLIB_TIME_SYSCALL_USE_HRT=y
+CONFIG_NEWLIB_TIME_SYSCALL_USE_RTC=n
+CONFIG_NEWLIB_TIME_SYSCALL_USE_RTC_HRT=n