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

Merge branch 'bugfix/idf_gdb_no_openocd_crash_v4.2' into 'release/v4.2'

Browse Source 
idf.py: Fixed gdb target to exit cleanly when no openocd watch task (v4.2)

See merge request espressif/esp-idf!10808
This commit is contained in:
Ivan Grokhotkov 2020-12-17 18:40:31 +08:00
commit 2b88ed8827
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tools/idf_py_actions/debug_ext.py
View File

@ -287,7 +287,11 @@ def action_extensions(base_actions, project_path):
continue
finally:
watch_openocd.join()
processes["threads_to_join"].remove(watch_openocd)
try:
processes["threads_to_join"].remove(watch_openocd)
except ValueError:
# Valid scenario: watch_openocd task won't be in the list if openocd not started from idf.py
pass
fail_if_openocd_failed = {
"names": ["--require-openocd", "--require_openocd"],