alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

idf.py: fix fallback to build system target

Browse Source
This commit is contained in:
Ivan Grokhotkov 2019-11-28 14:47:41 +01:00 committed by bot
parent 70cfd7e24c
commit 562a3980b2
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tools/ci/test_build_system_cmake.sh
View File

@ -576,6 +576,16 @@ endmenu\n" >> ${IDF_PATH}/Kconfig
|| failure "Version on worktree should have been properly resolved"
git worktree remove ../esp-idf-template-test
print_status "idf.py fallback to build system target"
clean_build_dir
msg="Custom target is running"
echo "" >> CMakeLists.txt
echo "add_custom_target(custom_target COMMAND \${CMAKE_COMMAND} -E echo \"${msg}\")" >> CMakeLists.txt
idf.py custom_target 1>log.txt || failure "Could not invoke idf.py with custom target"
grep "${msg}" log.txt 1>/dev/null || failure "Custom target did not produce expected output"
git checkout CMakeLists.txt
rm -f log.txt
print_status "All tests completed"
if [ -n "${FAILURES}" ]; then
echo "Some failures were detected:"

2
tools/idf_py_actions/core_ext.py
View File

@ -45,7 +45,7 @@ def action_extensions(base_actions, project_path):
ensure_build_directory(args, ctx.info_name)
try:
subprocess.check_output(GENERATORS[args.generator]["dry_run"] + [target_name], cwd=args.cwd)
subprocess.check_output(GENERATORS[args.generator]["dry_run"] + [target_name], cwd=args.build_dir)
except Exception:
raise FatalError(