diff --git a/components/fatfs/Kconfig b/components/fatfs/Kconfig index dbdb76f15f..c5b270e1e9 100644 --- a/components/fatfs/Kconfig +++ b/components/fatfs/Kconfig @@ -255,7 +255,7 @@ menu "FAT Filesystem support" It may create less fragmented file copy. config FATFS_USE_DYN_BUFFERS bool "Use dynamic buffers" - depend on CONFIG_WL_SECTOR_SIZE_4096 + depends on CONFIG_WL_SECTOR_SIZE_4096 default y help If enabled, the buffers used by FATFS will be allocated separately from the rest of the structure. diff --git a/components/fatfs/test_apps/flash_ro/pytest_fatfs_flash_ro.py b/components/fatfs/test_apps/flash_ro/pytest_fatfs_flash_ro.py index be1b048efd..3840e60f50 100644 --- a/components/fatfs/test_apps/flash_ro/pytest_fatfs_flash_ro.py +++ b/components/fatfs/test_apps/flash_ro/pytest_fatfs_flash_ro.py @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD +# SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD # SPDX-License-Identifier: CC0-1.0 import pytest from pytest_embedded import Dut @@ -8,8 +8,4 @@ from pytest_embedded import Dut @pytest.mark.esp32c3 @pytest.mark.generic def test_fatfs_flash_ro(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('*') - dut.expect_unity_test_output() + dut.run_all_single_board_cases() diff --git a/components/fatfs/test_apps/flash_wl/pytest_fatfs_flash_wl.py b/components/fatfs/test_apps/flash_wl/pytest_fatfs_flash_wl.py index 075698a578..9abd181502 100644 --- a/components/fatfs/test_apps/flash_wl/pytest_fatfs_flash_wl.py +++ b/components/fatfs/test_apps/flash_wl/pytest_fatfs_flash_wl.py @@ -13,15 +13,12 @@ from pytest_embedded import Dut 'default', 'release', 'fastseek', + 'auto_fsync', 'no_dyn_buffers', ] ) def test_fatfs_flash_wl_generic(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('*') - dut.expect_unity_test_output(timeout=180) + dut.run_all_single_board_cases(timeout=240) @pytest.mark.esp32 @@ -34,8 +31,4 @@ def test_fatfs_flash_wl_generic(dut: Dut) -> None: ] ) def test_fatfs_flash_wl_psram(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('*') - dut.expect_unity_test_output(timeout=180) + dut.run_all_single_board_cases(timeout=180) diff --git a/components/fatfs/test_apps/flash_wl/sdkconfig.ci.auto_fsync b/components/fatfs/test_apps/flash_wl/sdkconfig.ci.auto_fsync index b74d5124c8..85252ff496 100644 --- a/components/fatfs/test_apps/flash_wl/sdkconfig.ci.auto_fsync +++ b/components/fatfs/test_apps/flash_wl/sdkconfig.ci.auto_fsync @@ -1 +1,2 @@ CONFIG_FATFS_IMMEDIATE_FSYNC=y +CONFIG_ESP_MAIN_TASK_STACK_SIZE=4096 diff --git a/components/fatfs/test_apps/sdcard/pytest_fatfs_sdcard.py b/components/fatfs/test_apps/sdcard/pytest_fatfs_sdcard.py index 01309ba126..b49aece201 100644 --- a/components/fatfs/test_apps/sdcard/pytest_fatfs_sdcard.py +++ b/components/fatfs/test_apps/sdcard/pytest_fatfs_sdcard.py @@ -15,11 +15,7 @@ from pytest_embedded import Dut ] ) 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 @@ -34,11 +30,7 @@ def test_fatfs_sdcard_generic_sdmmc(dut: Dut) -> None: ] ) 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 @@ -51,11 +43,7 @@ def test_fatfs_sdcard_generic_sdspi(dut: Dut) -> None: ] ) 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 @@ -69,8 +57,4 @@ def test_fatfs_sdcard_psram_sdmmc(dut: Dut) -> None: ] ) 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)