From cffeb16104a829f0caf065998c63ecdec5c14e63 Mon Sep 17 00:00:00 2001
From: KonstantinKondrashov <konstantin@espressif.com>
Date: Thu, 31 Oct 2019 13:22:41 +0800
Subject: [PATCH 1/2] soc/esp32: Add test_env for 32kHz XTAL unit tests

---
 components/soc/esp32/test/test_rtc_clk.c | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/components/soc/esp32/test/test_rtc_clk.c b/components/soc/esp32/test/test_rtc_clk.c
index 39c3ac7fd..68e1b0690 100644
--- a/components/soc/esp32/test/test_rtc_clk.c
+++ b/components/soc/esp32/test/test_rtc_clk.c
@@ -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

From caea2e34a46ff36b7edcd81b603594c4956b8680 Mon Sep 17 00:00:00 2001
From: KonstantinKondrashov <konstantin@espressif.com>
Date: Thu, 14 Nov 2019 13:57:32 +0800
Subject: [PATCH 2/2] ci: Add test configs for 32kHz crystals

---
 .gitlab-ci.yml | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b46da3cc5..2693e7457 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -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: