Merge branch 'feature/add_env_tag_for_32khz_xtal_uts_v4.0' into 'release/v4.0'

soc(esp32&esp32s2beta): Add test_env for 32kHz XTAL unit tests (v4.0)

See merge request espressif/esp-idf!6603
This commit is contained in:
He Yin Ling 2019-11-18 10:44:20 +08:00
commit 4e6c575fed
2 changed files with 30 additions and 10 deletions

View file

@ -218,10 +218,7 @@ static void start_freq(rtc_slow_freq_t required_src_freq, uint32_t start_delay_m
printf("Test passed successfully\n");
}
#ifdef CONFIG_ESP32_SPIRAM_SUPPORT
// PSRAM tests run on ESP-WROVER-KIT boards, which have the 32k XTAL installed.
// Other tests may run on DevKitC boards, which don't have a 32k XTAL.
TEST_CASE("Test starting external RTC quartz", "[rtc_clk]")
TEST_CASE("Test starting external RTC quartz", "[rtc_clk][test_env=UT_T1_32kXTAL]")
{
int i = 0, fail = 0;
uint32_t start_time;
@ -262,15 +259,13 @@ TEST_CASE("Test starting external RTC quartz", "[rtc_clk]")
printf("Test passed successfully\n");
}
TEST_CASE("Test starting 'External 32kHz XTAL' on the board with it.", "[rtc_clk]")
TEST_CASE("Test starting 'External 32kHz XTAL' on the board with it.", "[rtc_clk][test_env=UT_T1_32kXTAL]")
{
start_freq(RTC_SLOW_FREQ_32K_XTAL, 200);
start_freq(RTC_SLOW_FREQ_32K_XTAL, 0);
}
#else
TEST_CASE("Test starting 'External 32kHz XTAL' on the board without it.", "[rtc_clk][ignore]")
TEST_CASE("Test starting 'External 32kHz XTAL' on the board without it.", "[rtc_clk][test_env=UT_T1_no32kXTAL]")
{
printf("Tries to start the 'External 32kHz XTAL' on the board without it. "
"Clock switching to 'Internal 150 kHz RC oscillator'.\n");
@ -283,5 +278,3 @@ TEST_CASE("Test starting 'External 32kHz XTAL' on the board without it.", "[rtc_
start_freq(RTC_SLOW_FREQ_RTC, 200);
start_freq(RTC_SLOW_FREQ_RTC, 0);
}
#endif // CONFIG_ESP32_SPIRAM_SUPPORT

View file

@ -452,6 +452,33 @@ UT_034:
- UT_T1_PSRAMV0
- psram
UT_035:
extends: .unit_test_template
parallel: 3
tags:
- ESP32_IDF
- UT_T1_no32kXTAL
UT_036:
extends: .unit_test_template
tags:
- ESP32_IDF
- UT_T1_no32kXTAL
- psram
UT_037:
extends: .unit_test_template
parallel: 3
tags:
- ESP32_IDF
- UT_T1_32kXTAL
UT_038:
extends: .unit_test_template
tags:
- ESP32_IDF
- UT_T1_32kXTAL
- psram
nvs_compatible_test:
extends: .test_template