From: Renz Christian Bagaporo Date: Wed, 5 Dec 2018 02:44:14 +0000 (+0800) Subject: ci: add test for setting EXTRA_COMPONENT_DIRS X-Git-Tag: v3.3-beta1~23^2 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b11238df4d8d6c65c388804d2884f2d2746b9a3e;p=esp-idf ci: add test for setting EXTRA_COMPONENT_DIRS --- diff --git a/tools/ci/test_build_system_cmake.sh b/tools/ci/test_build_system_cmake.sh index 7f138d5611..f12eeae5eb 100755 --- a/tools/ci/test_build_system_cmake.sh +++ b/tools/ci/test_build_system_cmake.sh @@ -266,6 +266,18 @@ function run_tests() mv CMakeLists.bak CMakeLists.txt assert_built ${APP_BINS} ${BOOTLOADER_BINS} ${PARTITION_BIN} + print_status "Setting EXTRA_COMPONENT_DIRS works" + clean_build_dir + mkdir -p main/main/main # move main component contents to another directory + mv main/* main/main/main + cp CMakeLists.txt CMakeLists.bak # set EXTRA_COMPONENT_DIRS to point to the other directory + sed -i "s%cmake_minimum_required(VERSION \([0-9]\+\).\([0-9]\+\))%cmake_minimum_required(VERSION \1.\2)\nset(EXTRA_COMPONENT_DIRS main/main/main)%" CMakeLists.txt + idf.py build || failure "Build with EXTRA_COMPONENT_DIRS set failed" + mv CMakeLists.bak CMakeLists.txt # revert previous modifications + mv main/main/main/* main + rm -rf main/main + assert_built ${APP_BINS} ${BOOTLOADER_BINS} ${PARTITION_BIN} + print_status "All tests completed" if [ -n "${FAILURES}" ]; then echo "Some failures were detected:"