Merge branch 'feature/esp_hw_support_pytest' into 'master'

esp_hw_support: migrate to pytest See merge request espressif/esp-idf!20938
espressif · Nov 28, 2022 · 6a450c4 · 6a450c4
2 parents 48a6f11 + 59e40fa
commit 6a450c4
Show file tree

Hide file tree

Showing 96 changed files with 995 additions and 902 deletions.
diff --git a/.gitlab/ci/target-test.yml b/.gitlab/ci/target-test.yml
@@ -362,6 +362,22 @@ component_ut_pytest_esp32_flash_multi:
     - build_pytest_components_esp32
   tags: [ esp32, flash_mutli ]
 
+component_ut_pytest_esp32_xtal32k:
+  extends:
+    - .pytest_components_dir_template
+    - .rules:test:component_ut-esp32
+  needs:
+    - build_pytest_components_esp32
+  tags: [ esp32, xtal32k ]
+
+component_ut_pytest_esp32_no32kXtal:
+  extends:
+    - .pytest_components_dir_template
+    - .rules:test:component_ut-esp32
+  needs:
+    - build_pytest_components_esp32
+  tags: [ esp32, no32kXtal ]
+
 component_ut_pytest_esp32_rs485_multi:
   extends:
     - .pytest_components_dir_template
@@ -370,6 +386,15 @@ component_ut_pytest_esp32_rs485_multi:
     - build_pytest_components_esp32
   tags: [ esp32, multi_dut_modbus_rs485 ]
 
+component_ut_pytest_esp32_psramv0:
+  extends:
+    - .pytest_components_dir_template
+    - .rules:test:component_ut-esp32
+  needs:
+    - build_pytest_components_esp32
+  tags: [ esp32, psramv0 ]
+
+
 component_ut_pytest_esp32s2_generic:
   extends:
     - .pytest_components_dir_template
@@ -1042,33 +1067,12 @@ UT_035:
     - ESP32S2_IDF
     - UT_T1_1
 
-UT_036:
-  extends: .unit_test_esp32_template
-  tags:
-    - ESP32_IDF
-    - UT_T1_PSRAMV0
-    - psram
-
 UT_038:
   extends: .unit_test_esp32s2_template
   tags:
     - ESP32S2_IDF
     - UT_T1_ESP_FLASH
 
-UT_041:
-  extends: .unit_test_esp32_template
-  tags:
-    - ESP32_IDF
-    - UT_T1_no32kXTAL
-    - psram
-
-UT_043:
-  extends: .unit_test_esp32_template
-  tags:
-    - ESP32_IDF
-    - UT_T1_32kXTAL
-    - psram
-
 UT_S2_SDSPI:
   extends: .unit_test_esp32s2_template
   tags:

diff --git a/components/esp_hw_support/.build-test-rules.yml b/components/esp_hw_support/.build-test-rules.yml
@@ -9,3 +9,9 @@ components/esp_hw_support/test_apps/dma:
 components/esp_hw_support/test_apps/etm:
   disable:
     - if: SOC_ETM_SUPPORTED != 1
+
+components/esp_hw_support/test_apps/rtc_clk:
+  disable:
+    - if: IDF_TARGET in ["esp32c6"]
+      temporary: true
+      reason: Unsupported on C6 for now. TODO IDF-5645
diff --git a/components/esp_hw_support/test/CMakeLists.txt b/components/esp_hw_support/test/CMakeLists.txt
diff --git a/components/esp_hw_support/test/test_ahb_arb.c b/components/esp_hw_support/test/test_ahb_arb.c