From 24b16b0b1951c09ae82da8d0384fe3cb2606f3d5 Mon Sep 17 00:00:00 2001
From: michael <xiaoxufeng@espressif.com>
Date: Wed, 22 Jan 2020 12:05:33 +0800
Subject: [PATCH] ci: resume esp32s2 unit tests

---
 components/driver/test/test_sdio.c          |  1 +
 tools/ci/config/target-test.yml             | 18 ++++++++++++++++--
 tools/unit-test-app/tools/UnitTestParser.py |  4 ----
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/components/driver/test/test_sdio.c b/components/driver/test/test_sdio.c
index 7a43114401..e86521330b 100644
--- a/components/driver/test/test_sdio.c
+++ b/components/driver/test/test_sdio.c
@@ -19,6 +19,7 @@
 #include "param_test.h"
 #include "esp_log.h"
 #include "driver/spi_common.h"
+#include "soc/soc_caps.h"
 
 #if defined(SOC_SDMMC_HOST_SUPPORTED) && defined(SOC_SDIO_SLAVE_SUPPORTED)
 #include "driver/sdio_slave.h"
diff --git a/tools/ci/config/target-test.yml b/tools/ci/config/target-test.yml
index f63b052baf..972abe432a 100644
--- a/tools/ci/config/target-test.yml
+++ b/tools/ci/config/target-test.yml
@@ -493,9 +493,23 @@ UT_034:
     - ESP32_IDF
     - UT_T1_ESP_FLASH
 
-UT_035:
+.unit_test_s2_template:
   extends: .unit_test_template
-  parallel: 24
+  only:
+    refs:
+      # Due to lack of runners, the tests are only done by manual trigger
+      # - master
+      # - /^release\/v/
+      # - /^v\d+\.\d+(\.\d+)?($|-)/
+      - triggers
+      # - schedules
+    variables:
+      - $BOT_TRIGGER_WITH_LABEL == null
+      - $BOT_LABEL_UNIT_TEST_S2
+
+UT_035:
+  extends: .unit_test_s2_template
+  parallel: 26
   tags:
     - ESP32S2_IDF
     - UT_T1_1
diff --git a/tools/unit-test-app/tools/UnitTestParser.py b/tools/unit-test-app/tools/UnitTestParser.py
index 6d27e90d10..31b485c64c 100644
--- a/tools/unit-test-app/tools/UnitTestParser.py
+++ b/tools/unit-test-app/tools/UnitTestParser.py
@@ -81,10 +81,6 @@ class Parser(object):
         else:
             target = "esp32"
 
-        if target == "esp32s2":
-            # Unit tests temporarily disabled for beta chip
-            return []
-
         test_groups = self.get_test_groups(os.path.join(configs_folder, config_name))
 
         elf_file = os.path.join(config_output_folder, self.ELF_FILE)