diff --git a/tools/ci/test_build_system_cmake.sh b/tools/ci/test_build_system_cmake.sh index 05bdb1b7a..d8a9cec2f 100755 --- a/tools/ci/test_build_system_cmake.sh +++ b/tools/ci/test_build_system_cmake.sh @@ -404,6 +404,9 @@ endmenu\n" >> ${IDF_PATH}/Kconfig; git checkout -- sdkconfig.rename Kconfig popd + print_status "Confserver can be invoked by idf.py" + echo '{"version": 1}' | idf.py confserver || failure "Couldn't load confserver" + print_status "Check ccache is used to build when present" touch ccache && chmod +x ccache # make sure that ccache is present for this test (export PATH=$PWD:$PATH && idf.py reconfigure | grep "ccache will be used for faster builds") || failure "ccache should be used when present" diff --git a/tools/cmake/kconfig.cmake b/tools/cmake/kconfig.cmake index 6846ba6fd..09ae1e5ec 100644 --- a/tools/cmake/kconfig.cmake +++ b/tools/cmake/kconfig.cmake @@ -212,8 +212,8 @@ function(__kconfig_generate_config sdkconfig sdkconfig_defaults) add_custom_target(confserver COMMAND ${CMAKE_COMMAND} -E env "COMPONENT_KCONFIGS=${kconfigs}" - "COMPONENT_KCONFIGS_PROJBUILD=${kconfigs_projbuild}" - ${PYTHON} ${IDF_PATH}/tools/kconfig_new/confserver.py --kconfig ${IDF_PATH}/Kconfig --config ${SDKCONFIG} + "COMPONENT_KCONFIGS_PROJBUILD=${kconfig_projbuilds}" + ${PYTHON} ${IDF_PATH}/tools/kconfig_new/confserver.py --kconfig ${IDF_PATH}/Kconfig --config ${sdkconfig} VERBATIM USES_TERMINAL) endfunction()