]> granicus.if.org Git - esp-idf/commitdiff
ci: fix build test with IDF_PATH unset on Windows
authorRenz Christian Bagaporo <renz@espressif.com>
Tue, 11 Dec 2018 08:00:28 +0000 (16:00 +0800)
committerRenz Christian Bagaporo <renz@espressif.com>
Thu, 13 Dec 2018 10:20:51 +0000 (18:20 +0800)
tools/ci/test_build_system_cmake.sh

index b308b9afe6e1ebe6598a594584d0db9257b24086..acb8f269c66f28d7c1b14b09b2042c85f308a0fc 100755 (executable)
@@ -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}