From 887421bb498b6f47b2be0e879b3676c1b18c36ed Mon Sep 17 00:00:00 2001 From: Darian Leung Date: Tue, 10 May 2022 18:00:30 +0800 Subject: [PATCH] ci: Fix failing build system test when FreeRTOS SMP is enabled Build system tests check that xtensa_vectors.S is rebuilt in some of the CMake build system tests. However, the path of this file may change when FreeRTOS SMP is enabled. This commit fixes the CMake build system test by selecting another ".S" file who's path does not change based on configuration. --- tools/ci/test_build_system_cmake.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/ci/test_build_system_cmake.sh b/tools/ci/test_build_system_cmake.sh index cb20728ef0..a7c43de2f4 100755 --- a/tools/ci/test_build_system_cmake.sh +++ b/tools/ci/test_build_system_cmake.sh @@ -254,7 +254,7 @@ function run_tests() # and therefore should rebuild assert_rebuilt esp-idf/newlib/CMakeFiles/${IDF_COMPONENT_PREFIX}_newlib.dir/newlib_init.c.obj assert_rebuilt esp-idf/nvs_flash/CMakeFiles/${IDF_COMPONENT_PREFIX}_nvs_flash.dir/src/nvs_api.cpp.obj - assert_rebuilt esp-idf/freertos/CMakeFiles/${IDF_COMPONENT_PREFIX}_freertos.dir/FreeRTOS-Kernel/portable/xtensa/xtensa_vectors.S.obj + assert_rebuilt esp-idf/esp_system/CMakeFiles/${IDF_COMPONENT_PREFIX}_esp_system.dir/port/arch/xtensa/panic_handler_asm.S.obj mv sdkconfig.bak sdkconfig print_status "Updating project CMakeLists.txt triggers full recompile" @@ -269,7 +269,7 @@ function run_tests() # similar to previous test assert_rebuilt esp-idf/newlib/CMakeFiles/${IDF_COMPONENT_PREFIX}_newlib.dir/newlib_init.c.obj assert_rebuilt esp-idf/nvs_flash/CMakeFiles/${IDF_COMPONENT_PREFIX}_nvs_flash.dir/src/nvs_api.cpp.obj - assert_rebuilt esp-idf/freertos/CMakeFiles/${IDF_COMPONENT_PREFIX}_freertos.dir/FreeRTOS-Kernel/portable/xtensa/xtensa_vectors.S.obj + assert_rebuilt esp-idf/esp_system/CMakeFiles/${IDF_COMPONENT_PREFIX}_esp_system.dir/port/arch/xtensa/panic_handler_asm.S.obj mv sdkconfig.bak sdkconfig print_status "Can build with Ninja (no idf.py)"