espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-02 20:24:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/idf_py_fallback' into 'master'

Browse Source 
idf.py: fix fallback to build system target

See merge request espressif/esp-idf!6874
This commit is contained in:
Angus Gratton
2019-12-04 16:53:11 +08:00
parent 70cfd7e24c 562a3980b2
commit 9b06b5cdf9
2 changed files with 11 additions and 1 deletions
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" || failure "Version on worktree should have been properly resolved"
git worktree remove ../esp-idf-template-test 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" print_status "All tests completed"
if [ -n "${FAILURES}" ]; then if [ -n "${FAILURES}" ]; then
echo "Some failures were detected:" 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) ensure_build_directory(args, ctx.info_name)
try: 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: except Exception:
raise FatalError( raise FatalError(