From 232da4ca72b7b4582d1f22021639e69470f1ad42 Mon Sep 17 00:00:00 2001
From: jiangguangming <jiangguangming@espressif.com>
Date: Tue, 10 Jan 2023 19:52:03 +0800
Subject: [PATCH] flash mmap: more config option for flash mmap test app

---
 .../test_apps/flash_mmap/pytest_flash_mmap.py | 46 +++++++++++++++++--
 .../flash_mmap/sdkconfig.ci.rom_impl          |  1 +
 .../flash_mmap/sdkconfig.ci.xip_psram         |  2 +
 .../sdkconfig.ci.xip_psram_with_rom_impl      |  4 ++
 4 files changed, 50 insertions(+), 3 deletions(-)
 create mode 100644 components/spi_flash/test_apps/flash_mmap/sdkconfig.ci.rom_impl
 create mode 100644 components/spi_flash/test_apps/flash_mmap/sdkconfig.ci.xip_psram
 create mode 100644 components/spi_flash/test_apps/flash_mmap/sdkconfig.ci.xip_psram_with_rom_impl

diff --git a/components/spi_flash/test_apps/flash_mmap/pytest_flash_mmap.py b/components/spi_flash/test_apps/flash_mmap/pytest_flash_mmap.py
index 94e8364213..ce5fb64224 100644
--- a/components/spi_flash/test_apps/flash_mmap/pytest_flash_mmap.py
+++ b/components/spi_flash/test_apps/flash_mmap/pytest_flash_mmap.py
@@ -16,6 +16,46 @@ from pytest_embedded import Dut
     indirect=True,
 )
 def test_flash_mmap(dut: Dut) -> None:
-    dut.expect_exact('Press ENTER to see the list of tests')
-    dut.write('*')
-    dut.expect_unity_test_output(timeout=120)
+    dut.run_all_single_board_cases(timeout=30)
+
+
+@pytest.mark.esp32s3
+@pytest.mark.esp32c3
+@pytest.mark.esp32c2
+@pytest.mark.generic
+@pytest.mark.parametrize(
+    'config',
+    [
+        'rom_impl',
+    ],
+    indirect=True,
+)
+def test_flash_mmap_rom_impl(dut: Dut) -> None:
+    dut.run_all_single_board_cases(timeout=30)
+
+
+@pytest.mark.esp32s2
+@pytest.mark.esp32s3
+@pytest.mark.generic
+@pytest.mark.parametrize(
+    'config',
+    [
+        'xip_psram',
+    ],
+    indirect=True,
+)
+def test_flash_mmap_xip_psram(dut: Dut) -> None:
+    dut.run_all_single_board_cases(timeout=30)
+
+
+@pytest.mark.esp32s3
+@pytest.mark.generic
+@pytest.mark.parametrize(
+    'config',
+    [
+        'xip_psram_with_rom_impl',
+    ],
+    indirect=True,
+)
+def test_flash_mmap_xip_psram_rom_impl(dut: Dut) -> None:
+    dut.run_all_single_board_cases(timeout=30)
diff --git a/components/spi_flash/test_apps/flash_mmap/sdkconfig.ci.rom_impl b/components/spi_flash/test_apps/flash_mmap/sdkconfig.ci.rom_impl
new file mode 100644
index 0000000000..edd9b33ea8
--- /dev/null
+++ b/components/spi_flash/test_apps/flash_mmap/sdkconfig.ci.rom_impl
@@ -0,0 +1 @@
+CONFIG_SPI_FLASH_ROM_IMPL=y
diff --git a/components/spi_flash/test_apps/flash_mmap/sdkconfig.ci.xip_psram b/components/spi_flash/test_apps/flash_mmap/sdkconfig.ci.xip_psram
new file mode 100644
index 0000000000..e5e840609e
--- /dev/null
+++ b/components/spi_flash/test_apps/flash_mmap/sdkconfig.ci.xip_psram
@@ -0,0 +1,2 @@
+CONFIG_SPIRAM_FETCH_INSTRUCTIONS=y
+CONFIG_SPIRAM_RODATA=y
diff --git a/components/spi_flash/test_apps/flash_mmap/sdkconfig.ci.xip_psram_with_rom_impl b/components/spi_flash/test_apps/flash_mmap/sdkconfig.ci.xip_psram_with_rom_impl
new file mode 100644
index 0000000000..2bca42b0de
--- /dev/null
+++ b/components/spi_flash/test_apps/flash_mmap/sdkconfig.ci.xip_psram_with_rom_impl
@@ -0,0 +1,4 @@
+CONFIG_IDF_TARGET="esp32s3"
+CONFIG_SPIRAM_FETCH_INSTRUCTIONS=y
+CONFIG_SPIRAM_RODATA=y
+CONFIG_SPI_FLASH_ROM_IMPL=y