summaryrefslogtreecommitdiff
path: root/lib/fatfs/test_apps/sdcard
diff options
context:
space:
mode:
Diffstat (limited to 'lib/fatfs/test_apps/sdcard')
-rw-r--r--lib/fatfs/test_apps/sdcard/README.md4
-rw-r--r--lib/fatfs/test_apps/sdcard/main/CMakeLists.txt2
-rw-r--r--lib/fatfs/test_apps/sdcard/main/test_fatfs_sdmmc.c275
-rw-r--r--lib/fatfs/test_apps/sdcard/main/test_fatfs_sdspi.c61
-rw-r--r--lib/fatfs/test_apps/sdcard/pytest_fatfs_sdcard.py48
-rw-r--r--lib/fatfs/test_apps/sdcard/sdkconfig.ci.psram.esp32 (renamed from lib/fatfs/test_apps/sdcard/sdkconfig.ci.psram)1
6 files changed, 348 insertions, 43 deletions
diff --git a/lib/fatfs/test_apps/sdcard/README.md b/lib/fatfs/test_apps/sdcard/README.md
index 639f1d38..381b38a9 100644
--- a/lib/fatfs/test_apps/sdcard/README.md
+++ b/lib/fatfs/test_apps/sdcard/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-S2 | ESP32-S3 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- |
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | -------- | -------- | -------- |
This test app runs a few FATFS test cases in a FAT-formatted SD card.
diff --git a/lib/fatfs/test_apps/sdcard/main/CMakeLists.txt b/lib/fatfs/test_apps/sdcard/main/CMakeLists.txt
index be2a969a..e4a519cb 100644
--- a/lib/fatfs/test_apps/sdcard/main/CMakeLists.txt
+++ b/lib/fatfs/test_apps/sdcard/main/CMakeLists.txt
@@ -1,6 +1,6 @@
idf_component_register(SRCS "test_fatfs_sdcard_main.c" "test_fatfs_sdspi.c"
INCLUDE_DIRS "."
- PRIV_REQUIRES unity fatfs vfs sdmmc driver test_fatfs_common
+ PRIV_REQUIRES unity fatfs vfs sdmmc driver test_fatfs_common esp_timer
WHOLE_ARCHIVE)
if(CONFIG_SOC_SDMMC_HOST_SUPPORTED)
diff --git a/lib/fatfs/test_apps/sdcard/main/test_fatfs_sdmmc.c b/lib/fatfs/test_apps/sdcard/main/test_fatfs_sdmmc.c
index 4504a5d6..e6478ad9 100644
--- a/lib/fatfs/test_apps/sdcard/main/test_fatfs_sdmmc.c
+++ b/lib/fatfs/test_apps/sdcard/main/test_fatfs_sdmmc.c
@@ -1,5 +1,5 @@
/*
- * SPDX-FileCopyrightText: 2015-2022 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2015-2024 Espressif Systems (Shanghai) CO LTD
*
* SPDX-License-Identifier: Apache-2.0
*/
@@ -13,6 +13,7 @@
#include "unity.h"
#include "esp_log.h"
#include "esp_random.h"
+#include "esp_timer.h"
#include "esp_vfs.h"
#include "esp_vfs_fat.h"
#include "freertos/FreeRTOS.h"
@@ -22,6 +23,7 @@
#include "ff.h"
#include "test_fatfs_common.h"
#include "soc/soc_caps.h"
+#include "vfs_fat_internal.h"
#if CONFIG_IDF_TARGET_ESP32
#define SDSPI_MISO_PIN 2
@@ -50,6 +52,7 @@
#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32S3)
// No runner
#include "driver/sdmmc_host.h"
+const char* base_path = "/sdcard";
static void test_setup_sdmmc(sdmmc_card_t **out_card)
{
@@ -61,7 +64,7 @@ static void test_setup_sdmmc(sdmmc_card_t **out_card)
.max_files = 5,
.allocation_unit_size = 16 * 1024
};
- TEST_ESP_OK(esp_vfs_fat_sdmmc_mount("/sdcard", &host, &slot_config, &mount_config, &card));
+ TEST_ESP_OK(esp_vfs_fat_sdmmc_mount(base_path, &host, &slot_config, &mount_config, &card));
*out_card = card;
}
@@ -102,6 +105,35 @@ TEST_CASE("(SD) can format partition", "[fatfs][sdmmc][timeout=180]")
test_teardown_sdmmc(card);
}
+TEST_CASE("(SD) can format partition with config", "[fatfs][sdmmc][timeout=180]")
+{
+ sdmmc_card_t *card = NULL;
+ test_setup_sdmmc(&card);
+ vfs_fat_sd_ctx_t* ctx = get_vfs_fat_get_sd_ctx(card);
+ TEST_ASSERT_NOT_NULL(ctx);
+
+ esp_vfs_fat_mount_config_t format_config = {
+ .format_if_mount_failed = true,
+ .max_files = 5,
+ .allocation_unit_size = 16 * 1024,
+ .use_one_fat = true,
+ };
+ TEST_ESP_OK(esp_vfs_fat_sdcard_format_cfg("/sdcard", card, &format_config));
+ TEST_ASSERT_TRUE(ctx->fs->n_fats == 1);
+
+ test_fatfs_create_file_with_text(test_filename, fatfs_test_hello_str);
+ test_fatfs_read_file(test_filename);
+
+ format_config.use_one_fat = false;
+ TEST_ESP_OK(esp_vfs_fat_sdcard_format_cfg("/sdcard", card, &format_config));
+ TEST_ASSERT_TRUE(ctx->fs->n_fats == 2);
+
+ test_fatfs_create_file_with_text(test_filename, fatfs_test_hello_str);
+ test_fatfs_read_file(test_filename);
+
+ test_teardown_sdmmc(card);
+}
+
TEST_CASE("(SD) can create and write file", "[fatfs][sdmmc]")
{
sdmmc_card_t *card = NULL;
@@ -156,7 +188,7 @@ TEST_CASE("(SD) can truncate", "[fatfs][sdmmc]")
{
sdmmc_card_t *card = NULL;
test_setup_sdmmc(&card);
- test_fatfs_truncate_file("/sdcard/truncate.txt");
+ test_fatfs_truncate_file("/sdcard/truncate.txt", true);
test_teardown_sdmmc(card);
}
@@ -164,9 +196,19 @@ TEST_CASE("(SD) can ftruncate", "[fatfs][sdmmc]")
{
sdmmc_card_t *card = NULL;
test_setup_sdmmc(&card);
- test_fatfs_ftruncate_file("/sdcard/ftrunc.txt");
+ test_fatfs_ftruncate_file("/sdcard/ftrunc.txt", true);
+ test_teardown_sdmmc(card);
+}
+
+#if FF_USE_EXPAND
+TEST_CASE("(SD) can esp_vfs_fat_create_contiguous_file", "[fatfs][sdmmc]")
+{
+ sdmmc_card_t *card = NULL;
+ test_setup_sdmmc(&card);
+ test_fatfs_create_contiguous_file("/sdcard", "/sdcard/expand.txt");
test_teardown_sdmmc(card);
}
+#endif
TEST_CASE("(SD) stat returns correct values", "[fatfs][sdmmc]")
{
@@ -275,6 +317,231 @@ static void sdmmc_speed_test(void *buf, size_t buf_size, size_t file_size, bool
TEST_ESP_OK(esp_vfs_fat_sdcard_unmount("/sdcard", card));
}
+TEST_CASE("(SD) mount FAT partitions and readdir to get stat structure", "[fatfs][sdmmc]")
+{
+ char name_dir_file[64];
+ char name_dir_stat[64] = {0};
+ const char* dir_prefix = "/sdcard";
+ int dir_prefix_len = strlen(dir_prefix);
+ int file_num = 300;
+
+ /* Mount FATFS in SD can WL at the same time. Create a file on each FS */
+ sdmmc_card_t* card = NULL;
+ test_setup_sdmmc(&card);
+ TEST_ESP_OK(esp_vfs_fat_sdcard_format("/sdcard", card));
+
+ //Create multiple files with text on sdcard. Each file size is 14 bytes
+ //Total files created are file_num (300 in this case)
+ //So directory size will be 300*14 bytes
+ for(int i=0;i<file_num;i++) {
+ snprintf(name_dir_file, sizeof(name_dir_file), "%s/boo_%d.bin", dir_prefix, i);
+ test_fatfs_create_file_with_text(name_dir_file, fatfs_test_hello_str);
+ }
+
+ //Start the timer to get time needed to calculate the directory size
+ int64_t start = esp_timer_get_time();
+ DIR* dir = opendir(dir_prefix);
+ TEST_ASSERT_NOT_NULL(dir);
+ struct stat st;
+ struct dirent* de;
+ uint32_t dir_size = 0;
+
+ // Call readdir before stat function and record the time needed to calculate the directory size
+ while(1) {
+ de = readdir(dir);
+ if (!de) {
+ break;
+ }
+ snprintf(name_dir_stat, dir_prefix_len+sizeof(de->d_name)+1, "%s/%s", dir_prefix, de->d_name);
+ TEST_ASSERT_EQUAL(0, stat(name_dir_stat, &st));
+ dir_size += st.st_size;
+ }
+ TEST_ASSERT_EQUAL(0, closedir(dir));
+ int64_t end = esp_timer_get_time();
+ int64_t total_time_readdir = end-start;
+ printf("Time in us for calculating directory size by calling readdir first and then stat func: %lld \n",total_time_readdir);
+ printf("Size of the directory %s is %"PRIu32"Kb\n", dir_prefix, (dir_size/1000));
+ TEST_ASSERT_EQUAL(file_num*strlen(fatfs_test_hello_str), dir_size); //each file size is 14 bytes
+
+ // Call stat function directly without calling readdir and record the time needed to calculate the directory size
+ dir_size = 0;
+ start = esp_timer_get_time();
+ for(int i=0;i<file_num;i++) {
+ snprintf(name_dir_file, sizeof(name_dir_file), "%s/boo_%d.bin", dir_prefix, i);
+ TEST_ASSERT_EQUAL(0, stat(name_dir_file, &st));
+ dir_size += st.st_size;
+ }
+ end = esp_timer_get_time();
+ int64_t total_time_stat = end-start;
+ printf("Time in us for calculating directory size by calling stat func: %lld \n",total_time_stat);
+ printf("Size of the directory %s is %"PRIu32"Kb\n", dir_prefix, (dir_size/1000));
+ printf("%d\n", strlen(fatfs_test_hello_str));
+ TEST_ASSERT_EQUAL(file_num*strlen(fatfs_test_hello_str), dir_size); //each file size is 14 bytes
+
+ for(int i=0;i<file_num;i++) {
+ snprintf(name_dir_file, sizeof(name_dir_file), "%s/boo_%d.bin", dir_prefix,i);
+ unlink(name_dir_file);
+ }
+
+ test_teardown_sdmmc(card);
+}
+
+typedef struct {
+ const char *dir;
+ const char *filename;
+ const char *str;
+ SemaphoreHandle_t sem;
+} test_task_param_t;
+
+static void test_task(void *param)
+{
+ DIR* dir = NULL;
+ struct dirent* de = NULL;
+ struct stat st;
+ char name_dir_stat[64] = {0};
+ const test_task_param_t *test_task_param = param;
+
+ dir = opendir(test_task_param->dir);
+ TEST_ASSERT_NOT_NULL(dir);
+ while(1) {
+ de = readdir(dir);
+ if (!de) {
+ break;
+ }
+ //Intentionally introduced a delay to ensure that the second task is triggered simultaneously.
+ vTaskDelay(10 / portTICK_PERIOD_MS);
+ snprintf(name_dir_stat, sizeof(test_task_param->dir)+sizeof(de->d_name), "%s/%s", test_task_param->dir, de->d_name);
+ TEST_ASSERT_EQUAL(0, stat(name_dir_stat, &st));
+ if (strcasecmp(de->d_name, test_task_param->filename) == 0) {
+ TEST_ASSERT_FALSE(st.st_mode & S_IFDIR);
+ TEST_ASSERT_EQUAL(strlen(test_task_param->str), st.st_size);
+ } else {
+ TEST_FAIL_MESSAGE("unexpected directory entry");
+ }
+ }
+
+ if (test_task_param->sem) {
+ xSemaphoreGive(test_task_param->sem);
+ }
+ vTaskDelete(NULL);
+}
+
+TEST_CASE("(SD) mount two FAT partitions, SDMMC and WL, at the same time and readdir to get stat structure", "[fatfs][sdmmc]")
+{
+ esp_vfs_fat_sdmmc_mount_config_t mount_config = {
+ .format_if_mount_failed = true,
+ .max_files = 5
+ };
+
+ const char *dir_prefix[FF_VOLUMES] = {"/sdcard", "/spiflash"};
+ const char *dir_filename[FF_VOLUMES] = {"sd.txt", "wl.txt"};
+ const char* str[FF_VOLUMES] = {"this is sd\n", "this is spiflash\n"};
+ const char* filename_sd = "/sdcard/sd.txt";
+ const char* filename_wl = "/spiflash/wl.txt";
+
+ /* Erase flash before the first use */
+ const esp_partition_t *test_partition = esp_partition_find_first(ESP_PARTITION_TYPE_DATA, ESP_PARTITION_SUBTYPE_DATA_FAT, NULL);
+ TEST_ASSERT_NOT_NULL(test_partition);
+ esp_partition_erase_range(test_partition, 0, test_partition->size);
+
+ /* Mount FATFS in SD can WL at the same time. Create a file on each FS */
+ wl_handle_t wl_handle = WL_INVALID_HANDLE;
+ sdmmc_card_t *card = NULL;
+ test_setup_sdmmc(&card);
+ TEST_ESP_OK(esp_vfs_fat_spiflash_mount_rw_wl("/spiflash", NULL, &mount_config, &wl_handle));
+ unlink(filename_sd);
+ unlink(filename_wl);
+ test_fatfs_create_file_with_text(filename_sd, str[0]);
+ test_fatfs_create_file_with_text(filename_wl, str[1]);
+
+ test_task_param_t test_task_param_sd = {
+ .dir = dir_prefix[0],
+ .filename = dir_filename[0],
+ .str = str[0],
+ .sem = xSemaphoreCreateBinary(),
+ };
+
+ test_task_param_t test_task_param_spiflash = {
+ .dir = dir_prefix[1],
+ .filename = dir_filename[1],
+ .str = str[1],
+ .sem = xSemaphoreCreateBinary(),
+ };
+
+ //Create two tasks with same priority to check file size on two different FAT partitions at the same time
+ xTaskCreate(test_task, "test_task_1", 8*1024, (void *) &test_task_param_sd, 5, NULL);
+ xTaskCreate(test_task, "test_task_2", 8*1024, (void *) &test_task_param_spiflash, 5, NULL);
+
+ TEST_ASSERT_EQUAL(pdTRUE, xSemaphoreTake(test_task_param_sd.sem, 1000 / portTICK_PERIOD_MS));
+ vSemaphoreDelete(test_task_param_sd.sem);
+ TEST_ASSERT_EQUAL(pdTRUE, xSemaphoreTake(test_task_param_spiflash.sem, 1000 / portTICK_PERIOD_MS));
+ vSemaphoreDelete(test_task_param_spiflash.sem);
+ TEST_ESP_OK(esp_vfs_fat_spiflash_unmount_rw_wl("/spiflash", wl_handle));
+ test_teardown_sdmmc(card);
+}
+
+TEST_CASE("(SD) read two directories and get stat structure for respective file at the same time", "[fatfs][sdmmc]")
+{
+ char name_dir_file[64];
+ char name_dir1_stat[64] = {0};
+ char name_dir2_stat[64] = {0};
+ const char* dir1_prefix = "/sdcard/dir1";
+ const char* dir2_prefix = "/sdcard/dir2";
+ int dir1_prefix_len = strlen(dir1_prefix);
+ int dir2_prefix_len = strlen(dir2_prefix);
+ const char* test_str1 = "Hello, World!\n";
+ const char* test_str2 = "Hello, ESP Community\n";
+
+ /* Mount FATFS in SD can WL at the same time. Create a file on each FS */
+ sdmmc_card_t* card = NULL;
+ test_setup_sdmmc(&card);
+
+ TEST_ASSERT_EQUAL(0, mkdir(dir1_prefix, 0755));
+ TEST_ASSERT_EQUAL(0, mkdir(dir2_prefix, 0755));
+
+ snprintf(name_dir_file, sizeof(name_dir_file), "%s/boo_1.bin", dir1_prefix);
+ test_fatfs_create_file_with_text(name_dir_file, test_str1);
+ snprintf(name_dir_file, sizeof(name_dir_file), "%s/boo_1.bin", dir2_prefix);
+ test_fatfs_create_file_with_text(name_dir_file, test_str2);
+
+ DIR* dir1 = opendir(dir1_prefix);
+ TEST_ASSERT_NOT_NULL(dir1);
+ DIR* dir2 = opendir(dir2_prefix);
+ TEST_ASSERT_NOT_NULL(dir2);
+ struct dirent* de1;
+ struct dirent* de2;
+ struct stat st1;
+ struct stat st2;
+
+ while(1) {
+ de1 = readdir(dir1);
+ if (!de1) {
+ break;
+ }
+ de2 = readdir(dir2);
+ if (!de2) {
+ break;
+ }
+ snprintf(name_dir1_stat, dir1_prefix_len+sizeof(de1->d_name)+1, "%s/%s", dir1_prefix, de1->d_name);
+ snprintf(name_dir2_stat, dir2_prefix_len+sizeof(de2->d_name)+1, "%s/%s", dir2_prefix, de2->d_name);
+ TEST_ASSERT_EQUAL(0, stat(name_dir1_stat, &st1));
+ TEST_ASSERT_EQUAL(0, stat(name_dir2_stat, &st2));
+ TEST_ASSERT_EQUAL(strlen(test_str1), st1.st_size); //size of dir1/boo_1.bin is 14
+ TEST_ASSERT_EQUAL(strlen(test_str2), st2.st_size); //size of dir2/boo_1.bin is 21
+ }
+ TEST_ASSERT_EQUAL(0, closedir(dir1));
+ TEST_ASSERT_EQUAL(0, closedir(dir2));
+
+ snprintf(name_dir_file, sizeof(name_dir_file), "%s/boo_1.bin", dir1_prefix);
+ unlink(name_dir_file);
+ snprintf(name_dir_file, sizeof(name_dir_file), "%s/boo_1.bin", dir2_prefix);
+ unlink(name_dir_file);
+ rmdir(dir1_prefix);
+ rmdir(dir2_prefix);
+
+ test_teardown_sdmmc(card);
+}
+
TEST_CASE("(SD) mount two FAT partitions, SDMMC and WL, at the same time", "[fatfs][sdmmc]")
{
esp_vfs_fat_sdmmc_mount_config_t mount_config = {
diff --git a/lib/fatfs/test_apps/sdcard/main/test_fatfs_sdspi.c b/lib/fatfs/test_apps/sdcard/main/test_fatfs_sdspi.c
index c1d567c0..a3247bd2 100644
--- a/lib/fatfs/test_apps/sdcard/main/test_fatfs_sdspi.c
+++ b/lib/fatfs/test_apps/sdcard/main/test_fatfs_sdspi.c
@@ -1,5 +1,5 @@
/*
- * SPDX-FileCopyrightText: 2015-2022 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2015-2024 Espressif Systems (Shanghai) CO LTD
*
* SPDX-License-Identifier: Apache-2.0
*/
@@ -22,6 +22,7 @@
#include "ff.h"
#include "test_fatfs_common.h"
#include "soc/soc_caps.h"
+#include "vfs_fat_internal.h"
#if CONFIG_IDF_TARGET_ESP32
#define SDSPI_MISO_PIN 2
@@ -34,13 +35,13 @@
#define SDSPI_MOSI_PIN 35
#define SDSPI_CLK_PIN 36
#define SDSPI_CS_PIN 34
-#elif CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32S3 || CONFIG_IDF_TARGET_ESP32C2 || CONFIG_IDF_TARGET_ESP32C6
+#elif CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32S3 || CONFIG_IDF_TARGET_ESP32C2 || CONFIG_IDF_TARGET_ESP32C6 || CONFIG_IDF_TARGET_ESP32C61
#define SDSPI_MISO_PIN 6
#define SDSPI_MOSI_PIN 4
#define SDSPI_CLK_PIN 5
#define SDSPI_CS_PIN 1
#define SPI_DMA_CHAN SPI_DMA_CH_AUTO
-#elif CONFIG_IDF_TARGET_ESP32H2
+#elif CONFIG_IDF_TARGET_ESP32H2 || CONFIG_IDF_TARGET_ESP32C5 || CONFIG_IDF_TARGET_ESP32P4
#define SDSPI_MISO_PIN 0
#define SDSPI_MOSI_PIN 5
#define SDSPI_CLK_PIN 4
@@ -89,7 +90,7 @@ static void test_teardown_sdspi(sdspi_mem_t* mem)
HEAP_SIZE_CHECK(mem->heap_size, 0);
}
-TEST_CASE("(SDSPI) write/read speed test", "[fatfs][sdspi]")
+TEST_CASE("(SDSPI) write/read speed test", "[fatfs][sdspi][timeout=120]")
{
sdspi_mem_t mem;
size_t file_size = 1 * 1024 * 1024;
@@ -197,3 +198,55 @@ TEST_CASE("(SDSPI) can format card", "[fatfs][sdspi][timeout=180]")
TEST_ESP_OK(esp_vfs_fat_sdcard_unmount(path, card));
test_teardown_sdspi(&mem);
}
+
+
+TEST_CASE("(SDSPI) can format card with config", "[fatfs][sdspi][timeout=180]")
+{
+ sdspi_mem_t mem;
+ test_setup_sdspi(&mem);
+
+ const char path[] = "/sdcard";
+ sdmmc_card_t *card;
+ card = NULL;
+ sdspi_device_config_t device_cfg = {
+ .gpio_cs = SDSPI_CS_PIN,
+ .host_id = SDSPI_HOST_ID,
+ .gpio_cd = SDSPI_SLOT_NO_CD,
+ .gpio_wp = SDSPI_SLOT_NO_WP,
+ .gpio_int = SDSPI_SLOT_NO_INT,
+ };
+
+ sdmmc_host_t host = SDSPI_HOST_DEFAULT();
+ host.slot = SDSPI_HOST_ID;
+ esp_vfs_fat_sdmmc_mount_config_t mount_config = {
+ .format_if_mount_failed = true,
+ .max_files = 5,
+ .allocation_unit_size = 64 * 1024,
+ };
+ TEST_ESP_OK(esp_vfs_fat_sdspi_mount(path, &host, &device_cfg, &mount_config, &card));
+
+ vfs_fat_sd_ctx_t* ctx = get_vfs_fat_get_sd_ctx(card);
+ TEST_ASSERT_NOT_NULL(ctx);
+
+ esp_vfs_fat_mount_config_t format_config = {
+ .format_if_mount_failed = true,
+ .max_files = 5,
+ .allocation_unit_size = 64 * 1024,
+ .use_one_fat = true,
+ };
+ TEST_ESP_OK(esp_vfs_fat_sdcard_format_cfg("/sdcard", card, &format_config));
+ TEST_ASSERT_TRUE(ctx->fs->n_fats == 1);
+
+ test_fatfs_create_file_with_text(s_test_filename, fatfs_test_hello_str);
+ test_fatfs_read_file(s_test_filename);
+
+ format_config.use_one_fat = false;
+ TEST_ESP_OK(esp_vfs_fat_sdcard_format_cfg("/sdcard", card, &format_config));
+ TEST_ASSERT_TRUE(ctx->fs->n_fats == 2);
+
+ test_fatfs_create_file_with_text(s_test_filename, fatfs_test_hello_str);
+ test_fatfs_read_file(s_test_filename);
+
+ TEST_ESP_OK(esp_vfs_fat_sdcard_unmount(path, card));
+ test_teardown_sdspi(&mem);
+}
diff --git a/lib/fatfs/test_apps/sdcard/pytest_fatfs_sdcard.py b/lib/fatfs/test_apps/sdcard/pytest_fatfs_sdcard.py
index fe720a02..b0657186 100644
--- a/lib/fatfs/test_apps/sdcard/pytest_fatfs_sdcard.py
+++ b/lib/fatfs/test_apps/sdcard/pytest_fatfs_sdcard.py
@@ -1,75 +1,59 @@
-# SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD
+# SPDX-FileCopyrightText: 2022-2025 Espressif Systems (Shanghai) CO LTD
# SPDX-License-Identifier: CC0-1.0
-
import pytest
from pytest_embedded import Dut
+from pytest_embedded_idf.utils import idf_parametrize
-@pytest.mark.esp32
@pytest.mark.sdcard_sdmode
@pytest.mark.parametrize(
'config',
[
'default',
'release',
- ]
+ ],
)
+@idf_parametrize('target', ['esp32', 'esp32c3'], indirect=['target'])
def test_fatfs_sdcard_generic_sdmmc(dut: Dut) -> None:
- dut.expect_exact('Press ENTER to see the list of tests')
- dut.write('')
- dut.expect_exact('Enter test for running.')
- dut.write('[sdmmc]')
- dut.expect_unity_test_output(timeout=180)
+ dut.run_all_single_board_cases(group='sdmmc', timeout=180)
-@pytest.mark.esp32
-@pytest.mark.esp32s2
-@pytest.mark.esp32c3
+@pytest.mark.temp_skip_ci(targets=['esp32'], reason='IDFCI-2058, temporary lack runner')
@pytest.mark.sdcard_spimode
@pytest.mark.parametrize(
'config',
[
'default',
'release',
- ]
+ ],
)
+@idf_parametrize('target', ['esp32', 'esp32c3'], indirect=['target'])
def test_fatfs_sdcard_generic_sdspi(dut: Dut) -> None:
- dut.expect_exact('Press ENTER to see the list of tests')
- dut.write('')
- dut.expect_exact('Enter test for running.')
- dut.write('[sdspi]')
- dut.expect_unity_test_output(timeout=180)
+ dut.run_all_single_board_cases(group='sdspi', timeout=180)
-@pytest.mark.esp32
@pytest.mark.sdcard_sdmode
@pytest.mark.psram
@pytest.mark.parametrize(
'config',
[
'psram',
- ]
+ ],
)
+@idf_parametrize('target', ['esp32'], indirect=['target'])
def test_fatfs_sdcard_psram_sdmmc(dut: Dut) -> None:
- dut.expect_exact('Press ENTER to see the list of tests')
- dut.write('')
- dut.expect_exact('Enter test for running.')
- dut.write('[sdmmc]')
- dut.expect_unity_test_output(timeout=180)
+ dut.run_all_single_board_cases(group='sdmmc', timeout=180)
-@pytest.mark.esp32
+@pytest.mark.temp_skip_ci(targets=['esp32'], reason='IDFCI-2058, temporary lack runner')
@pytest.mark.sdcard_spimode
@pytest.mark.psram
@pytest.mark.parametrize(
'config',
[
'psram',
- ]
+ ],
)
+@idf_parametrize('target', ['esp32'], indirect=['target'])
def test_fatfs_sdcard_psram_sdspi(dut: Dut) -> None:
- dut.expect_exact('Press ENTER to see the list of tests')
- dut.write('')
- dut.expect_exact('Enter test for running.')
- dut.write('[sdspi]')
- dut.expect_unity_test_output(timeout=180)
+ dut.run_all_single_board_cases(group='sdspi', timeout=180)
diff --git a/lib/fatfs/test_apps/sdcard/sdkconfig.ci.psram b/lib/fatfs/test_apps/sdcard/sdkconfig.ci.psram.esp32
index b3b45db9..5becfb94 100644
--- a/lib/fatfs/test_apps/sdcard/sdkconfig.ci.psram
+++ b/lib/fatfs/test_apps/sdcard/sdkconfig.ci.psram.esp32
@@ -1,3 +1,4 @@
+CONFIG_IDF_TARGET="esp32"
CONFIG_SPIRAM=y
CONFIG_SPIRAM_MALLOC_ALWAYSINTERNAL=0
CONFIG_FATFS_ALLOC_PREFER_EXTRAM=y
generated by cgit v1.2.3 (git 2.25.1) at 2026-04-29 15:46:45 +0000