Merge branch 'feature/add_env_tag_for_32khz_xtal_uts_v3.1' into 'release/v3.1'

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

See merge request espressif/esp-idf!6606
This commit is contained in:
Angus Gratton 2019-11-21 11:58:57 +08:00
commit 07fa97b94c
2 changed files with 53 additions and 10 deletions

View File

@ -1027,6 +1027,56 @@ UT_001_32:
- ESP32_IDF
- UT_T1_1
UT_001_33:
<<: *unit_test_template
tags:
- ESP32_IDF
- UT_T1_no32kXTAL
UT_001_34:
<<: *unit_test_template
tags:
- ESP32_IDF
- UT_T1_no32kXTAL
UT_001_35:
<<: *unit_test_template
tags:
- ESP32_IDF
- UT_T1_no32kXTAL
UT_001_36:
<<: *unit_test_template
tags:
- ESP32_IDF
- UT_T1_no32kXTAL
- psram
UT_001_37:
<<: *unit_test_template
tags:
- ESP32_IDF
- UT_T1_32kXTAL
UT_001_38:
<<: *unit_test_template
tags:
- ESP32_IDF
- UT_T1_32kXTAL
UT_001_39:
<<: *unit_test_template
tags:
- ESP32_IDF
- UT_T1_32kXTAL
UT_001_40:
<<: *unit_test_template
tags:
- ESP32_IDF
- UT_T1_32kXTAL
- psram
UT_002_01:
<<: *unit_test_template
tags:

View File

@ -214,10 +214,7 @@ static void start_freq(rtc_slow_freq_t required_src_freq, uint32_t start_delay_m
printf("Test passed successfully\n");
}
#ifdef CONFIG_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;
@ -258,15 +255,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");
@ -279,5 +274,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_SPIRAM_SUPPORT