From 84cb20793124bf054d0f2034defbce7a2fee58ea Mon Sep 17 00:00:00 2001 From: Sergei Silnov Date: Wed, 24 Nov 2021 12:32:22 +0100 Subject: [PATCH 1/2] ci: Remove component manager test from build system tests Component manager itself has a set of integration tests that run against different ESP-IDF versions --- tools/ci/test_build_system_cmake.sh | 8 -------- 1 file changed, 8 deletions(-) diff --git a/tools/ci/test_build_system_cmake.sh b/tools/ci/test_build_system_cmake.sh index fdd43ed6fd..6ce17d0c4a 100755 --- a/tools/ci/test_build_system_cmake.sh +++ b/tools/ci/test_build_system_cmake.sh @@ -701,14 +701,6 @@ endmenu\n" >> ${IDF_PATH}/Kconfig git checkout CMakeLists.txt rm -f log.txt - print_status "Compiles with dependencies delivered by component manager" - clean_build_dir - printf "\n#include \"test_component.h\"\n" >> main/main.c - printf "dependencies:\n test_component:\n path: test_component\n git: ${COMPONENT_MANAGER_TEST_REPO}\n" >> main/idf_component.yml - idf.py reconfigure build || failure "Build didn't succeed with required components installed by package manager" - rm main/idf_component.yml - git checkout main/main.c - print_status "Build fails if partitions don't fit in flash" sed -i.bak "s/CONFIG_ESPTOOLPY_FLASHSIZE.\+//" sdkconfig # remove all flashsize config echo "CONFIG_ESPTOOLPY_FLASHSIZE_1MB=y" >> sdkconfig # introduce undersize flash From a72893760a9e8d5e3c71635a7a28b1def8503cc6 Mon Sep 17 00:00:00 2001 From: Anton Maklakov Date: Fri, 26 Nov 2021 12:23:14 +0700 Subject: [PATCH 2/2] ci: Fix build system tests to clean the dir --- tools/ci/test_build_system_cmake.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/ci/test_build_system_cmake.sh b/tools/ci/test_build_system_cmake.sh index 6ce17d0c4a..d455f75102 100755 --- a/tools/ci/test_build_system_cmake.sh +++ b/tools/ci/test_build_system_cmake.sh @@ -702,6 +702,7 @@ endmenu\n" >> ${IDF_PATH}/Kconfig rm -f log.txt print_status "Build fails if partitions don't fit in flash" + clean_build_dir sed -i.bak "s/CONFIG_ESPTOOLPY_FLASHSIZE.\+//" sdkconfig # remove all flashsize config echo "CONFIG_ESPTOOLPY_FLASHSIZE_1MB=y" >> sdkconfig # introduce undersize flash ( idf.py build 2>&1 | grep "does not fit in configured flash size 1MB" ) || failure "Build didn't fail with expected flash size failure message" @@ -848,13 +849,14 @@ endmenu\n" >> ${IDF_PATH}/Kconfig idf.py docs --no-browser --language en --version v4.2.1 --target esp32 --starting-page get-started | grep "https://docs.espressif.com/projects/esp-idf/en/v4.2.1/esp32/get-started" || failure "'idf.py docs --no-browser --language en --version v4.2.1 --target esp32 --starting-page get-started' failed" print_status "Deprecation warning check" + cd ${TESTDIR}/template # click warning idf.py post_debug &> tmp.log - grep "Warning: Command \"post_debug\" is deprecated and will be removed in v5.0." tmp.log || (failure "Missing deprecation warning with command \"post_debug\"") + grep "Warning: Command \"post_debug\" is deprecated and will be removed in v5.0." tmp.log || failure "Missing deprecation warning with command \"post_debug\"" rm tmp.log # cmake warning idf.py efuse_common_table &> tmp.log - grep "Warning: Command efuse_common_table is deprecated and will be removed in the next major release." tmp.log || (failure "Missing deprecation warning with command \"efuse_common_table\"") + grep "Warning: Command efuse_common_table is deprecated and will be removed in the next major release." tmp.log || failure "Missing deprecation warning with command \"efuse_common_table\"" rm tmp.log print_status "All tests completed"