From 5511541d20d85e3853a3c012abef2843e0359a08 Mon Sep 17 00:00:00 2001 From: Renz Christian Bagaporo Date: Tue, 11 Dec 2018 16:00:28 +0800 Subject: [PATCH] ci: fix build test with IDF_PATH unset on Windows --- tools/ci/test_build_system_cmake.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/ci/test_build_system_cmake.sh b/tools/ci/test_build_system_cmake.sh index b308b9afe..acb8f269c 100755 --- a/tools/ci/test_build_system_cmake.sh +++ b/tools/ci/test_build_system_cmake.sh @@ -230,9 +230,9 @@ function run_tests() print_status "Can build with IDF_PATH unset and inferred by build system" clean_build_dir - sed -i.bak "s%\$ENV{IDF_PATH}%${IDF_PATH}%" CMakeLists.txt # expand to a hardcoded path - (unset IDF_PATH && cd build && - cmake -G Ninja .. && ninja) || failure "Ninja build failed" + sed -i.bak "s%\$ENV{IDF_PATH}%\${ci_idf_path}%" CMakeLists.txt # expand to a hardcoded path + (ci_idf_path=${IDF_PATH} && unset IDF_PATH && cd build && + cmake -G Ninja -D ci_idf_path=${ci_idf_path} .. && ninja) || failure "Ninja build failed" mv CMakeLists.txt.bak CMakeLists.txt assert_built ${APP_BINS} ${BOOTLOADER_BINS} ${PARTITION_BIN}