Merge branch 'bugfix/nvs_host_test_missing_struct' into 'release/v4.3'

[nvs] Add page host test to CI (backport 4.3)

See merge request espressif/esp-idf!15010

CMakeLists.txt

@@ -94,6 +94,13 @@ if(CONFIG_COMPILER_DUMP_RTL_FILES)
     list(APPEND compile_options "-fdump-rtl-expand")
 endif()
 
+if(NOT ${CMAKE_C_COMPILER_VERSION} VERSION_LESS 8.0.0)
+    if(CONFIG_COMPILER_HIDE_PATHS_MACROS)
+        list(APPEND compile_options "-fmacro-prefix-map=${CMAKE_SOURCE_DIR}=.")
+        list(APPEND compile_options "-fmacro-prefix-map=${IDF_PATH}=IDF")
+    endif()
+endif()
+
 # GCC-specific options
 if(CMAKE_C_COMPILER_ID STREQUAL "GNU")
     list(APPEND compile_options "-fstrict-volatile-bitfields"

components/nvs_flash/host_test/nvs_page_test/main/nvs_page_test.cpp

@@ -1,11 +1,11 @@
-/* Hello World Example
+// NVSPage Host Test
+//
+// This example code is in the Public Domain (or CC0 licensed, at your option.)
+//
+// Unless required by applicable law or agreed to in writing, this
+// software is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+// CONDITIONS OF ANY KIND, either express or implied.
 
-   This example code is in the Public Domain (or CC0 licensed, at your option.)
-
-   Unless required by applicable law or agreed to in writing, this
-   software is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
-   CONDITIONS OF ANY KIND, either express or implied.
-*/
 #include <stdio.h>
 #include "unity.h"
 #include "test_fixtures.hpp"
@@ -929,6 +929,6 @@ int main(int argc, char **argv)
     RUN_TEST(test_Page_calcEntries__active_wo_blob);
     RUN_TEST(test_Page_calcEntries__active_with_blob);
     RUN_TEST(test_Page_calcEntries__invalid);
-    UNITY_END();
-    return 0;
+    int failures = UNITY_END();
+    return failures;
 }

components/nvs_flash/host_test/nvs_page_test/sdkconfig.defaults

@@ -1,3 +1,4 @@
 CONFIG_UNITY_ENABLE_IDF_TEST_RUNNER=n
+CONFIG_COMPILER_HIDE_PATHS_MACROS=n
 CONFIG_IDF_TARGET="linux"
 CONFIG_CXX_EXCEPTIONS=y

components/spi_flash/sim/stubs/soc/include/hal/spi_flash_types.h

@@ -41,6 +41,11 @@ typedef enum {
     SPI_FLASH_READ_MODE_MAX,    ///< The fastest io mode supported by the host is ``ESP_FLASH_READ_MODE_MAX-1``.
 } esp_flash_io_mode_t;
 
+/**
+ * Configuration structure for the flash chip suspend feature.
+ */
+typedef struct spi_flash_sus_cmd_conf_dummy spi_flash_sus_cmd_conf;
+
 struct spi_flash_host_driver_s;
 typedef struct spi_flash_host_driver_s spi_flash_host_driver_t;
 

tools/ci/config/host-test.yml

@@ -362,3 +362,10 @@ test_detect_python:
     - "dash -c '. tools/detect_python.sh && echo Our Python: ${ESP_PYTHON?Python is not set}'"
     - "zsh -c '. tools/detect_python.sh && echo Our Python: ${ESP_PYTHON?Python is not set}'"
     - "fish -c 'source tools/detect_python.fish && echo Our Python: $ESP_PYTHON'"
+
+test_nvs_page:
+  extends: .host_test_template
+  script:
+    - cd ${IDF_PATH}/components/nvs_flash/host_test/nvs_page_test
+    - idf.py build
+    - build/host_nvs_page_test.elf