refactor(sdmmc): move sdmmc test apps to tools/test_apps

components/sdmmc/test_apps/.build-test-rules.yml

@@ -1,11 +0,0 @@
-# Documentation: .gitlab/ci/README.md#manifest-file-to-control-the-buildtest-apps
-
-components/sdmmc/test_apps:
-  disable:
-    - if: IDF_TARGET in ["esp32h2"]
-      temporary: true
-      reason: Console component not supported on H2 yet
-  disable_test:
-    - if: IDF_TARGET not in ["esp32", "esp32s2", "esp32c3"]
-      temporary: true
-      reason: No runners for other targets yet

components/sdmmc/test_apps/sdmmc_console/components/cmd_sdmmc/CMakeLists.txt

@@ -1,4 +0,0 @@
-idf_component_register(SRCS cmd_sdmmc.c
-                       INCLUDE_DIRS .
-                       PRIV_REQUIRES console sdmmc sdmmc_test_board
-)

tools/test_apps/.build-test-rules.yml

@@ -87,6 +87,20 @@ tools/test_apps/storage/partition_table_readonly:
     - fatfs
     - spiffs
 
+tools/test_apps/storage/sdmmc_console:
+  disable:
+    - if: IDF_TARGET in ["esp32h2"]
+      temporary: true
+      reason: Console component not supported on H2 yet
+  disable_test:
+    - if: IDF_TARGET not in ["esp32", "esp32s2", "esp32c3"]
+      temporary: true
+      reason: No runners for other targets yet
+  depends_components:
+    - sdmmc
+    - esp_driver_sdmmc
+    - driver # driver will be replaced with esp_driver_sdspi
+
 tools/test_apps/system/bootloader_sections:
   disable:
     - if: IDF_TARGET == "esp32c2"

tools/test_apps/storage/sdmmc_console/components/cmd_sdmmc/CMakeLists.txt

@@ -0,0 +1,5 @@
+idf_component_register(SRCS cmd_sdmmc.c
+                       INCLUDE_DIRS .
+                       PRIV_REQUIRES console sdmmc esp_driver_sdmmc esp_driver_gpio sdmmc_test_board
+                       driver # driver will be replaced with esp_driver_sdspi later
+)

tools/test_apps/storage/sdmmc_console/components/cmd_sdmmc/cmd_sdmmc.c

@@ -11,8 +11,8 @@
 #include "esp_check.h"
 #include "esp_console.h"
 #include "soc/soc_caps.h"
-#include "driver/sdmmc_defs.h"
+#include "sd_protocol_defs.h"
-#include "driver/sdmmc_types.h"
+#include "sd_protocol_types.h"
 #include "sdmmc_cmd.h"
 #ifdef SOC_SDMMC_HOST_SUPPORTED
 #include "driver/sdmmc_host.h"

tools/test_apps/storage/sdmmc_console/components/sdmmc_tests/CMakeLists.txt

@@ -3,7 +3,8 @@ idf_component_register(
         sdmmc_test_cd_wp_common.c
         sdmmc_test_rw_common.c
      PRIV_REQUIRES
-          sdmmc sdmmc_test_board esp_timer unity test_utils
+          sdmmc esp_driver_sdmmc sdmmc_test_board esp_timer unity test_utils
+          driver # driver will be replaced with esp_driver_sdspi later
      WHOLE_ARCHIVE TRUE
 )
 

tools/test_apps/storage/sdmmc_console/components/sdmmc_tests/sdmmc_test_begin_end.h

@@ -5,7 +5,7 @@
  */
 #pragma once
 
-#include "driver/sdmmc_types.h"
+#include "sd_protocol_types.h"
 
 #ifdef __cplusplus
 extern "C" {

tools/test_apps/storage/sdmmc_console/components/sdmmc_tests/sdmmc_test_begin_end_sd.c

@@ -11,7 +11,7 @@
 #include "unity.h"
 #include "sdmmc_test_board.h"
 #include "driver/sdmmc_host.h"
-#include "driver/sdmmc_defs.h"
+#include "sd_protocol_defs.h"
 #include "sdmmc_cmd.h"
 #include "sdmmc_test_begin_end.h"
 #include "hal/gpio_hal.h"

tools/test_apps/storage/sdmmc_console/components/sdmmc_tests/sdmmc_test_begin_end_spi.c

@@ -11,7 +11,7 @@
 #include "esp_log.h"
 #include "sdmmc_test_board.h"
 #include "driver/sdspi_host.h"
-#include "driver/sdmmc_defs.h"
+#include "sd_protocol_defs.h"
 #include "sdmmc_cmd.h"
 #include "sdmmc_test_begin_end.h"
 

tools/test_apps/storage/sdmmc_console/components/sdmmc_tests/sdmmc_test_cd_wp_common.h

@@ -5,7 +5,7 @@
  */
 #pragma once
 
-#include "driver/sdmmc_types.h"
+#include "sd_protocol_types.h"
 #ifdef __cplusplus
 extern "C" {
 #endif

tools/test_apps/storage/sdmmc_console/components/sdmmc_tests/sdmmc_test_rw_common.c

@@ -12,7 +12,7 @@
 #include "sdkconfig.h"
 #include "soc/soc_caps.h"
 #include "unity.h"
-#include "driver/sdmmc_defs.h"
+#include "sd_protocol_defs.h"
 #include "sdmmc_cmd.h"
 #include "sdmmc_test_rw_common.h"
 

tools/test_apps/storage/sdmmc_console/components/sdmmc_tests/sdmmc_test_rw_common.h

@@ -5,7 +5,7 @@
  */
 #pragma once
 
-#include "driver/sdmmc_types.h"
+#include "sd_protocol_types.h"
 
 #ifdef __cplusplus
 extern "C" {