From 1be5e5eae5e7a7a5b26a8ff9539d75e5e94a2c5e Mon Sep 17 00:00:00 2001 From: Ivan Grokhotkov Date: Wed, 24 Aug 2022 10:34:54 +0200 Subject: [PATCH] ci: fix incorrect paths in the build system test The working directory when the test runs is not $IDF_PATH, it is the directory of the template project. --- tools/ci/test_build_system_cmake.sh | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/tools/ci/test_build_system_cmake.sh b/tools/ci/test_build_system_cmake.sh index 10b85b882f..9cc0f91390 100755 --- a/tools/ci/test_build_system_cmake.sh +++ b/tools/ci/test_build_system_cmake.sh @@ -854,25 +854,24 @@ endmenu\n" >> ${IDF_PATH}/Kconfig print_status "Create project using idf.py and build it" echo "Trying to create project." (idf.py -C projects create-project temp_test_project) || failure "Failed to create the project." - cd "$IDF_PATH/projects/temp_test_project" + pushd "$PWD/projects/temp_test_project" echo "Building the project temp_test_project . . ." idf.py build || failure "Failed to build the project." - cd "$IDF_PATH" - rm -rf "$IDF_PATH/projects/temp_test_project" + popd + rm -rf "$PWD/projects/temp_test_project" print_status "Create component using idf.py, create project using idf.py." print_status "Add the component to the created project and build the project." echo "Trying to create project . . ." (idf.py -C projects create-project temp_test_project) || failure "Failed to create the project." + pushd "$PWD/projects/temp_test_project" echo "Trying to create component . . ." (idf.py -C components create-component temp_test_component) || failure "Failed to create the component." - ${SED} -i '5i\\tfunc();' "$IDF_PATH/projects/temp_test_project/main/temp_test_project.c" - ${SED} -i '5i#include "temp_test_component.h"' "$IDF_PATH/projects/temp_test_project/main/temp_test_project.c" - cd "$IDF_PATH/projects/temp_test_project" + ${SED} -i '5i\\tfunc();' "main/temp_test_project.c" + ${SED} -i '5i#include "temp_test_component.h"' "main/temp_test_project.c" idf.py build || failure "Failed to build the project." - cd "$IDF_PATH" - rm -rf "$IDF_PATH/projects/temp_test_project" - rm -rf "$IDF_PATH/components/temp_test_component" + popd + rm -rf "$PWD/projects/temp_test_project" print_status "Check that command for creating new project will fail if the target folder is not empty." mkdir "$IDF_PATH/example_proj/"