Mirrors/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2026-10-01 10:40:47 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/nvs-blockdev-skip-nvs-ram-test_v6.0' into 'release/v6.0'

Browse Source 
fix(nvs_flash): skip SPIRAM heap test on non-spiram configs (v6.0)

See merge request espressif/esp-idf!48784
This commit is contained in:
Jiang Jiang Jian
2026-06-29 15:31:29 +08:00
parent 4ea1cda1ff 71c7fb3f79
commit ec50de41d2
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/nvs_flash/test_apps/main/test_nvs.c
+2
View File
@@ -42,6 +42,7 @@ extern int32_t get_heap_free_difference(const bool nvs_active_pool);
static const char* TAG = "test_nvs";
#if CONFIG_SPIRAM
TEST_CASE("Kconfig option controls heap capability allocator for NVS", "[nvs_ram]")
{
// number of keys used for test
@@ -104,6 +105,7 @@ TEST_CASE("Kconfig option controls heap capability allocator for NVS", "[nvs_ram
TEST_ASSERT_GREATER_THAN_INT32(0, get_heap_free_difference(true));
TEST_ASSERT_GREATER_OR_EQUAL_INT32(0, get_heap_free_difference(false));
}
#endif // CONFIG_SPIRAM
TEST_CASE("Partition name no longer than 16 characters", "[nvs]")
{
components/nvs_flash/test_apps/pytest_nvs_flash.py
+4 -3
View File
@@ -1,4 +1,4 @@
# SPDX-FileCopyrightText: 2023-2025 Espressif Systems (Shanghai) CO LTD
# SPDX-FileCopyrightText: 2023-2026 Espressif Systems (Shanghai) CO LTD
# SPDX-License-Identifier: Apache-2.0
import pytest
from pytest_embedded_idf.dut import IdfDut
@@ -9,14 +9,14 @@ from pytest_embedded_idf.utils import idf_parametrize
@pytest.mark.parametrize('config', ['default'], indirect=True)
@idf_parametrize('target', ['esp32', 'esp32c3'], indirect=['target'])
def test_nvs_flash(dut: IdfDut) -> None:
dut.run_all_single_board_cases(group='!nvs_encr_hmac', timeout=120)
dut.run_all_single_board_cases(group='!nvs_encr_hmac&!nvs_ram', timeout=120)
@pytest.mark.generic
@pytest.mark.parametrize('config', ['blockdev'], indirect=True)
@idf_parametrize('target', ['esp32', 'esp32c3'], indirect=['target'])
def test_nvs_flash_blockdev(dut: IdfDut) -> None:
dut.run_all_single_board_cases(group='!nvs_encr_hmac', timeout=120)
dut.run_all_single_board_cases(group='!nvs_encr_hmac&!nvs_ram', timeout=120)
@pytest.mark.nvs_encr_hmac
@@ -46,6 +46,7 @@ def test_nvs_flash_encr_flash_enc(dut: IdfDut) -> None:
@pytest.mark.psram
@pytest.mark.parametrize('config', ['spiram'], indirect=True)
@idf_parametrize('target', ['esp32'], indirect=['target'])
def test_nvs_flash_ram(dut: IdfDut) -> None:
dut.run_all_single_board_cases(group='nvs_ram')