From 3a402fa7b267a6b35a49c5b09918d27a24430948 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 ee05a302b..55cee7569 100644
--- a/components/soc/esp32/test/test_rtc_clk.c
+++ b/components/soc/esp32/test/test_rtc_clk.c
@@ -219,10 +219,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;
@@ -263,15 +260,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");
@@ -284,5 +279,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 3265b7ce0c31de18374cbdb9dd9a3594e18bfe42 Mon Sep 17 00:00:00 2001
From: KonstantinKondrashov <konstantin@espressif.com>
Date: Thu, 14 Nov 2019 13:28:52 +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 3e3b765ae..1733f170e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1243,6 +1243,56 @@ UT_001_42:
     - ESP32_IDF
     - UT_T1_1
 
+UT_001_43:
+  <<: *unit_test_template
+  tags:
+    - ESP32_IDF
+    - UT_T1_no32kXTAL
+
+UT_001_44:
+  <<: *unit_test_template
+  tags:
+    - ESP32_IDF
+    - UT_T1_no32kXTAL
+
+UT_001_45:
+  <<: *unit_test_template
+  tags:
+    - ESP32_IDF
+    - UT_T1_no32kXTAL
+
+UT_001_46:
+  <<: *unit_test_template
+  tags:
+    - ESP32_IDF
+    - UT_T1_no32kXTAL
+    - psram
+
+UT_001_47:
+  <<: *unit_test_template
+  tags:
+    - ESP32_IDF
+    - UT_T1_32kXTAL
+
+UT_001_48:
+  <<: *unit_test_template
+  tags:
+    - ESP32_IDF
+    - UT_T1_32kXTAL
+
+UT_001_49:
+  <<: *unit_test_template
+  tags:
+    - ESP32_IDF
+    - UT_T1_32kXTAL
+
+UT_001_50:
+  <<: *unit_test_template
+  tags:
+    - ESP32_IDF
+    - UT_T1_32kXTAL
+    - psram
+
 UT_002_01:
   <<: *unit_test_template
   tags: