Merge branch 'bugfix/nvs-blockdev-skip-nvs-ram-test_v5.4' into 'release/v5.4'

fix(nvs_flash): skip SPIRAM heap test on non-spiram configs (v5.4)

See merge request espressif/esp-idf!48786
This commit is contained in:
Martin Vychodil
2026-05-21 21:52:37 +08:00
2 changed files with 4 additions and 1 deletions
@@ -41,6 +41,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
@@ -103,6 +104,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]")
{
@@ -14,7 +14,7 @@ CONFIGS_NVS_ENCR_FLASH_ENC = [
@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.nvs_encr_hmac
@@ -44,6 +44,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')