Explorar o código

ci: remove mfix-esp32-psram-cache-issue flag test when building idf_as_lib

Previously psram driver was in esp_hw_support, which is a common
requirement(when in non-bootloader build). So when building
idf_as_lib (on esp32), the mfix-esp32-psram-cache-issue flag
will always be added (when CONFIG_SPIRAM_CACHE_WORKAROUND is on).

As psram driver is moved to esp_psram component, and esp_psram
is added via idf_component_optional_requires, which is a "weak"
dependency. You need to include esp_psram compoennt explicitly
if psram will be in use.

As idf_as_lib doesn't need psram, this test can be removed.
Armando %!s(int64=3) %!d(string=hai) anos
pai
achega
082ee45a76
Modificáronse 1 ficheiros con 0 adicións e 3 borrados
  1. 0 3
      tools/ci/test_build_system_cmake.sh

+ 0 - 3
tools/ci/test_build_system_cmake.sh

@@ -529,12 +529,9 @@ function run_tests()
     print_status "Test for external libraries in custom CMake projects with ESP-IDF components linked"
     mkdir build
     IDF_AS_LIB=$IDF_PATH/examples/build_system/cmake/idf_as_lib
-    echo "CONFIG_SPIRAM=y" > $IDF_AS_LIB/sdkconfig
-    echo "CONFIG_SPIRAM_CACHE_WORKAROUND=y" >> $IDF_AS_LIB/sdkconfig
     # note: we just need to run cmake
     (cd build && cmake $IDF_AS_LIB -DCMAKE_TOOLCHAIN_FILE=$IDF_PATH/tools/cmake/toolchain-esp32.cmake -DTARGET=esp32)
     grep -q '"command"' build/compile_commands.json || failure "compile_commands.json missing or has no no 'commands' in it"
-    (grep '"command"' build/compile_commands.json | grep -v mfix-esp32-psram-cache-issue) && failure "All commands in compile_commands.json should use PSRAM cache workaround"
 
     for strat in MEMW NOPS DUPLDST; do
         print_status "Test for external libraries in custom CMake projects with PSRAM strategy $strat"